Commits

Anonymous committed 235721f

#i92932# system openssl not detected on FreeBSD

Comments (0)

Files changed (5)

     AC_MSG_RESULT([external])
     # Mac OS builds should get out without extra stuff is the Mac porters'
     # wish. And pkg-config is although Xcode ships a .pc for openssl
-    if test "$_os" = "Darwin"; then
+    if test "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
         OPENSSL_CFLAGS=
         OPENSSL_LIBS="-lssl -lcrypto"
     else

filter/source/msfilter/escherex.cxx

 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/extract.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/virdev.hxx>
 #include <rtl/crc.h>
 #include <vos/xception.hxx>
         else if ( rSource == String( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ) ) )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >xBitmap;
-            if ( ::cppu::extractInterface( xBitmap, aAny ) )
+            if ( ::comphelper::extractInterface( xBitmap, aAny ) )
             {
                 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp;
                 if ( aAny >>= xBmp )

filter/source/msfilter/eschesdo.cxx

 #include <vcl/graph.hxx>
 #include <tools/debug.hxx>
 #include <svx/fmdpage.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 		rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString::createFromAscii("RotateAngle") ));
 
 		if( ( rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("IsFontwork") ) &&
-			::cppu::any2bool( rObj.GetUsrAny() ) ) ||
+			::comphelper::any2bool( rObj.GetUsrAny() ) ) ||
 			rObj.GetType().EqualsAscii( "drawing.Measure" ) || rObj.GetType().EqualsAscii( "drawing.Caption" ) )
 		{
 /*
 		static const OUString sEmptyPresStr(rtl::OUString::createFromAscii("IsEmptyPresentationObject"));
 
 		if( ImplGetPropertyValue( sPresStr ) )
-			mbPresObj = ::cppu::any2bool( mAny );
+			mbPresObj = ::comphelper::any2bool( mAny );
 
 		if( mbPresObj && ImplGetPropertyValue( sEmptyPresStr ) )
-			mbEmptyPresObj = ::cppu::any2bool( mAny );
+			mbEmptyPresObj = ::comphelper::any2bool( mAny );
 
 		mbValid = TRUE;
 	}

filter/source/msfilter/msocximex.cxx

 
 using namespace ::com::sun::star;
 using namespace ::rtl;
-using namespace cppu;
+using namespace comphelper;
 
 
 #define WW8_ASCII2STR(s) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(s))

filter/source/msfilter/svdfppt.cxx

 #include <editeng/langitem.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/unoapi.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>