[Libreoffice-commits] .: vcl/aqua

David Tardon dtardon at kemper.freedesktop.org
Mon Dec 5 08:42:22 PST 2011


 vcl/aqua/source/gdi/salprn.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 03f0a84c009b7c2738c8aaa52b5cc2a0b9ddd9f3
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 5 17:41:58 2011 +0100

    fix build on macosx

diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 6712243..46a0264 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -43,6 +43,7 @@
 
 #include "com/sun/star/beans/PropertyValue.hpp"
 #include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/uno/Sequence.hpp"
 
 #include <algorithm>
 
@@ -50,6 +51,8 @@ using namespace vcl;
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
 
+namespace uno = com::sun::star::uno;
+
 using ::rtl::OUString;
 using ::rtl::OStringToOUString;
 
@@ -366,7 +369,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
 static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPage )
 {
     Size aPageSize;
-    Sequence< PropertyValue > aPageParms( i_rController.getPageParameters( i_nPage ) );
+    uno::Sequence< PropertyValue > aPageParms( i_rController.getPageParameters( i_nPage ) );
     for( sal_Int32 nProperty = 0, nPropertyCount = aPageParms.getLength(); nProperty < nPropertyCount; ++nProperty )
     {
         if( aPageParms[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageSize" ) ) )
@@ -515,7 +518,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
             if( pPrintOperation )
             {
                 NSObject* pReleaseAfterUse = nil;
-                bool bShowPanel = (! i_rController.isDirectPrint() && getUseNativeDialog() && i_rController.isShowDialogs() );
+                bool bShowPanel = (! i_rController.isDirectPrint() && useSystemPrintDialog() && i_rController.isShowDialogs() );
                 [pPrintOperation setShowsPrintPanel: bShowPanel ? YES : NO ];
                 [pPrintOperation setShowsProgressPanel: bShowProgressPanel ? YES : NO];
 


More information about the Libreoffice-commits mailing list