openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1441343 [31/35] - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Date Fri, 01 Feb 2013 08:46:35 GMT
Modified: openoffice/branches/ia2/main/toolkit/util/toolkit.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/util/toolkit.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/toolkit/util/toolkit.xml (original)
+++ openoffice/branches/ia2/main/toolkit/util/toolkit.xml Fri Feb  1 08:46:00 2013
@@ -646,46 +646,6 @@
         <supported-service>com.sun.star.awt.UnoControlSpinButton</supported-service>
     </component-description>
     <component-description>
-        <author>Dirk Voelzke</author>
-        <name>com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel</name>
-        <description>specifies the model of a simple animation control</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final" />
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoSimpleAnimationControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author>Dirk Voelzke</author>
-        <name>com.sun.star.comp.toolkit.UnoSimpleAnimationControl</name>
-        <description>specifies a simple animation control</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final" />
-        <supported-service>com.sun.star.awt.UnoControl</supported-service>
-        <supported-service>com.sun.star.awt.UnoSimpleAnimationControl</supported-service>
-    </component-description>
-    <component-description>
-        <author>Dirk Voelzke</author>
-        <name>com.sun.star.comp.toolkit.UnoThrobberControlModel</name>
-        <description>specifies the model of a throbber control (a spinning wheel)</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final" />
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoThrobberControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author>Dirk Voelzke</author>
-        <name>com.sun.star.comp.toolkit.UnoThrobberControl</name>
-        <description>specifies a throbber control (a spinning wheel)</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final" />
-        <supported-service>com.sun.star.awt.UnoControl</supported-service>
-        <supported-service>com.sun.star.awt.UnoThrobberControl</supported-service>
-    </component-description>
-    <component-description>
         <author>Christian Lippka</author>
         <name>stardiv.Toolkit.UnoTreeModel</name>
         <description>specifies the model of a tree control</description>

Modified: openoffice/branches/ia2/main/tools/test/tests.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/tools/test/tests.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/tools/test/tests.cxx (original)
+++ openoffice/branches/ia2/main/tools/test/tests.cxx Fri Feb  1 08:46:00 2013
@@ -21,7 +21,6 @@
 
 
 
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
 // autogenerated file with codegen.pl

Modified: openoffice/branches/ia2/main/ucb/source/ucp/file/bc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/ucb/source/ucp/file/bc.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/ucb/source/ucp/file/bc.cxx (original)
+++ openoffice/branches/ia2/main/ucb/source/ucp/file/bc.cxx Fri Feb  1 08:46:00 2013
@@ -1186,7 +1186,7 @@ void SAL_CALL BaseContent::insert( sal_I
 
     // Inserts the content, which has the flag m_bIsFresh
 
-    if( ! m_nState & NameForInsertionSet )
+    if ( !m_nState | !NameForInsertionSet )
     {
         m_pMyShell->installError( nMyCommandIdentifier,
                                   TASKHANDLING_NONAMESET_INSERT_COMMAND );

Modified: openoffice/branches/ia2/main/ucb/source/ucp/ftp/test.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/ucb/source/ucp/ftp/test.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/ucb/source/ucp/ftp/test.py (original)
+++ openoffice/branches/ia2/main/ucb/source/ucp/ftp/test.py Fri Feb  1 08:46:00 2013
@@ -29,7 +29,7 @@ def grep(pattern,dirname,names):
 			lines = open(filename,"r").readlines()
 			for line in lines:
 				if pattern.search(line):
-					print filename
+					print(filename)
 					break
 
 

Modified: openoffice/branches/ia2/main/ucb/source/ucp/webdav/webdavresponseparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/ucb/source/ucp/webdav/webdavresponseparser.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/ucb/source/ucp/webdav/webdavresponseparser.cxx (original)
+++ openoffice/branches/ia2/main/ucb/source/ucp/webdav/webdavresponseparser.cxx Fri Feb  1 08:46:00 2013
@@ -180,8 +180,8 @@ namespace
 
         const ::rtl::OUString& getNamespace() const { return maNamespace; }
         const ::rtl::OUString& getName() const { return maName; }
-        const WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; }
-        const WebDAVName getWebDAVName() const { return maWebDAVName; }
+        WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; }
+        WebDAVName getWebDAVName() const { return maWebDAVName; }
     };
 
     void WebDAVContext::parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs)

Modified: openoffice/branches/ia2/main/unoil/climaker/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/unoil/climaker/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/unoil/climaker/makefile.mk (original)
+++ openoffice/branches/ia2/main/unoil/climaker/makefile.mk Fri Feb  1 08:46:00 2013
@@ -64,8 +64,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA
 		$(CLIMAKER) $(CLIMAKERFLAGS) \
 		--out $@ \
  		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
-		--assembly-company "OpenOffice.org" \
-		--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+		--assembly-company "Apache OpenOffice" \
+		--assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
 		-X $(EXTRA_RDB) \
 		-r $(SOLARBINDIR)$/cli_uretypes.dll \
         --keyfile $(SOLARBINDIR)$/cliuno.snk \

Modified: openoffice/branches/ia2/main/unotools/source/config/inetoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/unotools/source/config/inetoptions.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/unotools/source/config/inetoptions.cxx (original)
+++ openoffice/branches/ia2/main/unotools/source/config/inetoptions.cxx Fri Feb  1 08:46:00 2013
@@ -38,7 +38,6 @@
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/beans/XPropertiesChangeListener.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/system/XProxySettings.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>

Modified: openoffice/branches/ia2/main/uui/source/newerverwarn.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/uui/source/newerverwarn.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/uui/source/newerverwarn.cxx (original)
+++ openoffice/branches/ia2/main/uui/source/newerverwarn.cxx Fri Feb  1 08:46:00 2013
@@ -27,7 +27,7 @@
 
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
@@ -98,12 +98,9 @@ IMPL_LINK( NewerVersionWarningDialog, Up
     {
         if ( ( sNotifyURL.getLength() > 0 ) && ( m_sVersion.getLength() > 0 ) )
         {
-            uno::Reference< lang::XMultiServiceFactory > xSMGR =
-                ::comphelper::getProcessServiceFactory();
             uno::Reference< XSystemShellExecute > xSystemShell(
-                xSMGR->createInstance( ::rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
-                uno::UNO_QUERY_THROW );
+                com::sun::star::system::SystemShellExecute::create(
+                    ::comphelper::getProcessComponentContext() ) );
             sNotifyURL += m_sVersion;
             if ( xSystemShell.is() && sNotifyURL.getLength() )
             {

Modified: openoffice/branches/ia2/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/Library_vcl.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/Library_vcl.mk (original)
+++ openoffice/branches/ia2/main/vcl/Library_vcl.mk Fri Feb  1 08:46:00 2013
@@ -321,7 +321,6 @@ $(eval $(call gb_Library_add_exception_o
     vcl/source/gdi/alpha \
     vcl/source/gdi/animate \
     vcl/source/gdi/base14 \
-    vcl/source/gdi/bitmap2 \
     vcl/source/gdi/bitmap3 \
     vcl/source/gdi/bitmap4 \
     vcl/source/gdi/bitmap \
@@ -334,6 +333,7 @@ $(eval $(call gb_Library_add_exception_o
     vcl/source/gdi/configsettings \
     vcl/source/gdi/cvtgrf \
     vcl/source/gdi/cvtsvm \
+    vcl/source/gdi/dibtools \
     vcl/source/gdi/extoutdevdata \
     vcl/source/gdi/font \
     vcl/source/gdi/gdimtf \

Modified: openoffice/branches/ia2/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/Library_vclplug_gen.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/Library_vclplug_gen.mk (original)
+++ openoffice/branches/ia2/main/vcl/Library_vclplug_gen.mk Fri Feb  1 08:46:00 2013
@@ -124,7 +124,6 @@ $(eval $(call gb_Library_set_defs,vclplu
 ifeq ($(XRANDR_DLOPEN),FALSE)
 $(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
     $$(CXXFLAGS) \
-    $$(XRANDR_CFLAGS) \
 ))
 $(eval $(call gb_Library_set_ldflags,vclplug_gen,\
     $$(LDFLAGS) \

Modified: openoffice/branches/ia2/main/vcl/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/Package_inc.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/Package_inc.mk (original)
+++ openoffice/branches/ia2/main/vcl/Package_inc.mk Fri Feb  1 08:46:00 2013
@@ -30,6 +30,7 @@ $(eval $(call gb_Package_add_file,vcl_in
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/arrange.hxx,vcl/arrange.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmapex.hxx,vcl/bitmapex.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmap.hxx,vcl/bitmap.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dibtools.hxx,vcl/dibtools.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bmpacc.hxx,vcl/bmpacc.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/btndlg.hxx,vcl/btndlg.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/button.hxx,vcl/button.hxx))

Modified: openoffice/branches/ia2/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx (original)
+++ openoffice/branches/ia2/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx Fri Feb  1 08:46:00 2013
@@ -125,8 +125,8 @@ namespace // private
 	{
 	  { NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", CPPUTYPE_OUSTRING },
 	  { NSRTFPboardType, "text/richtext", "Rich Text Format", CPPUTYPE_SEQINT8 },
-	  { NSTIFFPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
-	  { NSPICTPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
+	  { NSTIFFPboardType, "image/png", "Portable Network Graphics", CPPUTYPE_SEQINT8 },
+	  { NSPICTPboardType, "image/png", "Portable Network Graphics", CPPUTYPE_SEQINT8 },
 	  { NSHTMLPboardType, "text/html", "Plain Html", CPPUTYPE_SEQINT8 },
 	  { NSFilenamesPboardType, "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", CPPUTYPE_SEQINT8 }, 
 	  { PBTYPE_SESX, FLAVOR_SESX, "Star Embed Source (XML)", CPPUTYPE_SEQINT8 },
@@ -371,73 +371,65 @@ Any HTMLFormatDataProvider::getOOoData()
 
 //###########################
 
-class BMPDataProvider : public DataProviderBaseImpl
+class PNGDataProvider : public DataProviderBaseImpl
 {
-    NSBitmapImageFileType meImageType;
+	NSBitmapImageFileType meImageType;
 public:
-  BMPDataProvider(const Any& data, NSBitmapImageFileType eImageType );
+	PNGDataProvider( const Any&, NSBitmapImageFileType);
 
-  BMPDataProvider(NSData* data, NSBitmapImageFileType eImageType);
+	PNGDataProvider( NSData*, NSBitmapImageFileType);
 
-  virtual NSData* getSystemData();
+	virtual NSData* getSystemData();
 
-  virtual Any getOOoData();
+	virtual Any getOOoData();
 };
 
-BMPDataProvider::BMPDataProvider(const Any& data, NSBitmapImageFileType eImageType) :
+PNGDataProvider::PNGDataProvider( const Any& data, NSBitmapImageFileType eImageType) :
   DataProviderBaseImpl(data),
   meImageType( eImageType )
 {
 }
 
-BMPDataProvider::BMPDataProvider(NSData* data, NSBitmapImageFileType eImageType) :
+PNGDataProvider::PNGDataProvider( NSData* data, NSBitmapImageFileType eImageType) :
   DataProviderBaseImpl(data),
   meImageType( eImageType )
 {
 }
 
-NSData* BMPDataProvider::getSystemData()
+NSData* PNGDataProvider::getSystemData()
 {
-  Sequence<sal_Int8> bmpData;
-  mData >>= bmpData;
+	Sequence<sal_Int8> pngData;
+	mData >>= pngData;
 
-  Sequence<sal_Int8> pictData;
-  NSData* sysData = NULL;
+	Sequence<sal_Int8> imgData;
+	NSData* sysData = NULL;
+	if( PNGToImage( pngData, imgData, meImageType))
+		sysData = [NSData dataWithBytes: imgData.getArray() length: imgData.getLength()];
 
-  if (BMPToImage(bmpData, pictData, meImageType))
-	{
-	  sysData = [NSData dataWithBytes: pictData.getArray() length: pictData.getLength()];
-	}
-
-  return sysData;
+	return sysData;
 }
 
-/* At the moment the OOo 'PCT' filter is not good enough to be used
-   and there is no flavor defined for exchanging 'PCT' with OOo so
-   we will at the moment convert 'PCT' to a Windows BMP and provide
-   this to OOo 
+/* The AOO 'PCT' filter is not yet good enough to be used
+   and there is no flavor defined for exchanging 'PCT' with AOO
+   so we convert 'PCT' to a PNG and provide this to AOO 
 */
-Any BMPDataProvider::getOOoData()
+Any PNGDataProvider::getOOoData()
 {
-  Any oOOData;
+	Any oOOData;
 
-  if (mSystemData)
+	if( mSystemData)
 	{
-	  unsigned int flavorDataLength = [mSystemData length];
-	  Sequence<sal_Int8> pictData(flavorDataLength);
-
-	  memcpy(pictData.getArray(), [mSystemData bytes], flavorDataLength);
+		const unsigned int flavorDataLength = [mSystemData length];
+		Sequence<sal_Int8> imgData( flavorDataLength);
+		memcpy( imgData.getArray(), [mSystemData bytes], flavorDataLength);
 
-	  Sequence<sal_Int8> bmpData;
-	  
-	  if (ImageToBMP(pictData, bmpData, meImageType))
-		{
-		  oOOData = makeAny(bmpData);
-		}
+		Sequence<sal_Int8> pngData;
+		if( ImageToPNG( imgData, pngData, meImageType))
+			oOOData = makeAny( pngData);
 	}
-  else
+	else
 	{
-	  oOOData = mData;
+		oOOData = mData;
 	}
   
   return oOOData;
@@ -617,11 +609,11 @@ DataProviderPtr_t DataFlavorMapper::getD
 		  */
 		  if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == NSOrderedSame)
 			{
-			  dp = DataProviderPtr_t(new BMPDataProvider(data, PICTImageFileType));
+			  dp = DataProviderPtr_t( new PNGDataProvider( data, PICTImageFileType));
 			}
 		  else if ([systemFlavor caseInsensitiveCompare: NSTIFFPboardType] == NSOrderedSame)
 			{
-			  dp = DataProviderPtr_t(new BMPDataProvider(data, NSTIFFFileType));
+			  dp = DataProviderPtr_t( new PNGDataProvider( data, NSTIFFFileType));
 			}
 		  else if ([systemFlavor caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
 			{
@@ -666,11 +658,11 @@ DataProviderPtr_t DataFlavorMapper::getD
 	}
   else if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == NSOrderedSame)
 	{
-	  dp = DataProviderPtr_t(new BMPDataProvider(systemData, PICTImageFileType));
+	  dp = DataProviderPtr_t( new PNGDataProvider(systemData, PICTImageFileType));
 	}
   else if ([systemFlavor caseInsensitiveCompare: NSTIFFPboardType] == NSOrderedSame)
 	{
-	  dp = DataProviderPtr_t(new BMPDataProvider(systemData, NSTIFFFileType));
+	  dp = DataProviderPtr_t( new PNGDataProvider(systemData, NSTIFFFileType));
 	}
   else if ([systemFlavor caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
 	{

Modified: openoffice/branches/ia2/main/vcl/aqua/source/dtrans/OSXTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/aqua/source/dtrans/OSXTransferable.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/aqua/source/dtrans/OSXTransferable.cxx (original)
+++ openoffice/branches/ia2/main/vcl/aqua/source/dtrans/OSXTransferable.cxx Fri Feb  1 08:46:00 2013
@@ -85,7 +85,7 @@ Any SAL_CALL OSXTransferable::getTransfe
 	}
 
   NSString* sysFormat = 
-      (aFlavor.MimeType.compareToAscii( "image/bmp", 9 ) == 0)
+      (aFlavor.MimeType.compareToAscii( "image/png", 9 ) == 0)
       ? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
       : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor);
   DataProviderPtr_t dp;

Modified: openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx (original)
+++ openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx Fri Feb  1 08:46:00 2013
@@ -36,159 +36,130 @@
 
 #include "PictToBmpFlt.hxx"
 
-bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict, 
-			   com::sun::star::uno::Sequence<sal_Int8>& aBmp)
+bool PICTtoPNG( com::sun::star::uno::Sequence<sal_Int8>& rPictData,
+			com::sun::star::uno::Sequence<sal_Int8>& rPngData)
 {
-    
-  bool result = false;
-
-  ComponentInstance bmpExporter;
-  if (OpenADefaultComponent(GraphicsExporterComponentType,
-							kQTFileTypeBMP,
-							&bmpExporter) != noErr)
-	{
-	  return result;
-	}
-
-  Handle hPict;
-  if (PtrToHand(aPict.getArray(), &hPict, aPict.getLength()) != noErr)
-	{
-	  return result;
-	}
-
-  Handle hBmp;
-  if ((GraphicsExportSetInputPicture(bmpExporter, (PicHandle)hPict) != noErr) || 
-	  ((hBmp = NewHandleClear(0)) == NULL))
-	{
-	  CloseComponent(bmpExporter);
-	  DisposeHandle(hPict);
-	  return result;
-	}
-
-  if ((GraphicsExportSetOutputHandle(bmpExporter, hBmp) == noErr) &&
-	  (GraphicsExportDoExport(bmpExporter, NULL) == noErr))
-	{
-	  size_t sz = GetHandleSize(hBmp);
-	  aBmp.realloc(sz);
-
-	  HLock(hBmp);
-	  rtl_copyMemory(aBmp.getArray(), ((sal_Int8*)*hBmp), sz);
-	  HUnlock(hBmp);
-
-	  result = true;
+	ComponentInstance pngExporter = NULL;
+	if( OpenADefaultComponent( GraphicsExporterComponentType, kQTFileTypePNG, &pngExporter) != noErr)
+		return false;
+
+	Handle hPict = NULL;
+	if( PtrToHand( rPictData.getArray(), &hPict, rPictData.getLength()) != noErr)
+		hPict = NULL;
+
+	Handle hPng = NULL;
+	if( hPict && GraphicsExportSetInputPicture( pngExporter, (PicHandle)hPict) == noErr)
+		hPng = NewHandleClear(0);
+
+	size_t nPngSize = 0;
+	if( hPng
+	&& (GraphicsExportSetOutputHandle( pngExporter, hPng) == noErr)
+	&& (GraphicsExportDoExport( pngExporter, NULL) == noErr))
+	{
+		nPngSize = GetHandleSize( hPng);
+		rPngData.realloc( nPngSize);
+
+		HLock( hPng);
+		rtl_copyMemory( rPngData.getArray(), ((sal_Int8*)*hPng), nPngSize);
+		HUnlock( hPng);
 	} 
 
-  DisposeHandle(hPict);
-  DisposeHandle(hBmp);
-  CloseComponent(bmpExporter);
+	if( hPict)
+		DisposeHandle( hPict);
+	if( hPng)
+		DisposeHandle( hPng);
+	if( pngExporter)
+		CloseComponent( pngExporter);
 
-  return result;
+	return (nPngSize > 0);
 }
 
-bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
-			   com::sun::star::uno::Sequence<sal_Int8>& aPict)
-{
-  bool result = false;
 
-  Handle hBmp;
-  ComponentInstance pictExporter;
-  if ((PtrToHand(aBmp.getArray(), &hBmp, aBmp.getLength()) != noErr)) 
-	{
-	  return result;
-	}
-
-  if (OpenADefaultComponent(GraphicsImporterComponentType,
-							kQTFileTypeBMP,
-							&pictExporter) != noErr)
-	{
-	  DisposeHandle(hBmp);
-	  return result;
-	}
+bool PNGtoPICT( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+			   com::sun::star::uno::Sequence<sal_Int8>& rPictData)
+{
+	ComponentInstance pictExporter;
+	if( OpenADefaultComponent( GraphicsImporterComponentType, kQTFileTypePNG, &pictExporter) != noErr)
+		return false;
+
+	Handle hPng = NULL;
+	if( PtrToHand( rPngData.getArray(), &hPng, rPngData.getLength()) != noErr)
+		hPng = NULL;
   
-  if (GraphicsImportSetDataHandle(pictExporter, hBmp) != noErr)
-	{
-	  DisposeHandle(hBmp);
-	  CloseComponent(pictExporter);
-	  return result;
-	}
-
-  PicHandle hPict;
-  if (GraphicsImportGetAsPicture(pictExporter, &hPict) == noErr)
-	{
-	  size_t sz = GetHandleSize((Handle)hPict);
-	  aPict.realloc(sz);
-
-	  HLock((Handle)hPict);
-	  rtl_copyMemory(aPict.getArray(), ((sal_Int8*)*hPict), sz);
-	  HUnlock((Handle)hPict);
-
-	  // Release the data associated with the picture
-	  // Note: This function is deprecated in Mac OS X 
-	  // 10.4.
-	  KillPicture(hPict); 
-
-	  result = true;
+	size_t nPictSize = 0;
+	PicHandle hPict = NULL;
+	if( hPng
+	&& (GraphicsImportSetDataHandle( pictExporter, hPng) == noErr)
+	&& (GraphicsImportGetAsPicture( pictExporter, &hPict) == noErr))
+	{
+		nPictSize = GetHandleSize( (Handle)hPict);
+		rPictData.realloc( nPictSize);
+
+		HLock( (Handle)hPict);
+		rtl_copyMemory( rPictData.getArray(), ((sal_Int8*)*hPict), nPictSize);
+		HUnlock( (Handle)hPict);
+
+		// Release the data associated with the picture
+		// Note: This function is deprecated in Mac OSX 10.4
+		KillPicture( hPict);
 	}
   
-  DisposeHandle(hBmp);
-  CloseComponent(pictExporter);
+	if( hPng)
+		DisposeHandle( hPng);
+	if( pictExporter)
+		CloseComponent( pictExporter);
   
-  return result;
+	return (nPictSize > 512);
 }
 
-bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict, 
-			     com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData, 
+			     com::sun::star::uno::Sequence<sal_Int8>& rPngData,
 			     NSBitmapImageFileType eInFormat)
 {
-    if( eInFormat == PICTImageFileType )
-        return PICTtoBMP( aPict, aBmp );
-    
-    bool bResult = false;
-    
-    NSData* pData = [NSData dataWithBytesNoCopy: (void*)aPict.getConstArray() length: aPict.getLength() freeWhenDone: 0];
-    if( pData )
-    {
-        NSBitmapImageRep* pRep = [NSBitmapImageRep imageRepWithData: pData];
-        if( pRep )
-        {
-            NSData* pOut = [pRep representationUsingType: NSBMPFileType properties: nil];
-            if( pOut )
-            {
-                aBmp.realloc( [pOut length] );
-                [pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
-                bResult = (aBmp.getLength() != 0);
-            }
-        }
-    }
-    
-    return bResult;
+	if( eInFormat == PICTImageFileType)
+		return PICTtoPNG( rImgData, rPngData);
+
+	NSData* pData = [NSData dataWithBytesNoCopy: (void*)rImgData.getConstArray() length: rImgData.getLength() freeWhenDone: 0];
+	if( !pData)
+		return false;
+
+	NSBitmapImageRep* pRep =[NSBitmapImageRep imageRepWithData: pData];
+        if( !pRep)
+		return false;
+
+	NSData* pOut = [pRep representationUsingType: NSPNGFileType properties: nil];
+	if( !pOut)
+		return false;
+
+	const size_t nPngSize = [pOut length];
+	rPngData.realloc( nPngSize);
+	[pOut getBytes: rPngData.getArray() length: nPngSize];
+	return (nPngSize > 0);
 }
 
-bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
-			     com::sun::star::uno::Sequence<sal_Int8>& aPict,
+bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+			     com::sun::star::uno::Sequence<sal_Int8>& rImgData,
 			     NSBitmapImageFileType eOutFormat
 			    )
 {
-    if( eOutFormat == PICTImageFileType )
-        return BMPtoPICT( aBmp, aPict );
-    
-    bool bResult = false;
+	if( eOutFormat == PICTImageFileType)
+		return PNGtoPICT( rPngData, rImgData);
     
-    NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(aBmp.getConstArray()) length: aBmp.getLength() freeWhenDone: 0];
-    if( pData )
-    {
+	NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(rPngData.getConstArray()) length: rPngData.getLength() freeWhenDone: 0];
+	if( !pData)
+		return false;
+
         NSBitmapImageRep* pRep = [NSBitmapImageRep imageRepWithData: pData];
-        if( pRep )
-        {
-            NSData* pOut = [pRep representationUsingType: eOutFormat properties: nil];
-            if( pOut )
-            {
-                aPict.realloc( [pOut length] );
-                [pOut getBytes: aPict.getArray() length: aPict.getLength()];
-                bResult = (aPict.getLength() != 0);
-            }
-        }
-    }
-    
-    return bResult;
+        if( !pRep)
+		return false;
+
+	NSData* pOut = [pRep representationUsingType: eOutFormat properties: nil];
+	if( !pOut)
+		return false;
+
+	const size_t nImgSize = [pOut length];
+	rImgData.realloc( nImgSize);
+	[pOut getBytes: rImgData.getArray() length: nImgSize];
+	return (nImgSize > 0);
 }
+

Modified: openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx (original)
+++ openoffice/branches/ia2/main/vcl/aqua/source/dtrans/PictToBmpFlt.hxx Fri Feb  1 08:46:00 2013
@@ -28,31 +28,31 @@
 #include <Cocoa/Cocoa.h>
 #include <postmac.h>
 
-/* Transform PICT into the a Window BMP.
+/** Transform an image from PICT to PNG format
 
    Returns true if the conversion was successful false 
    otherwise.
  */
-bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict, 
-			   com::sun::star::uno::Sequence<sal_Int8>& aBmp);
+bool PICTtoPNG(com::sun::star::uno::Sequence<sal_Int8>& rPictData, 
+			   com::sun::star::uno::Sequence<sal_Int8>& rPngData);
 
-/* Transform a Windows BMP to a PICT.
+/** Transform an image from PNG to a PICT format
 
    Returns true if the conversion was successful false
    otherwise.
  */
-bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
-			   com::sun::star::uno::Sequence<sal_Int8>& aPict);
+bool PNGtoPICT(com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+			   com::sun::star::uno::Sequence<sal_Int8>& rPictData);
 
 #define PICTImageFileType ((NSBitmapImageFileType)~0)
 
-bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict, 
-			     com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+			     com::sun::star::uno::Sequence<sal_Int8>& rPngData,
 			     NSBitmapImageFileType eInFormat);
 
-bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp, 
-			     com::sun::star::uno::Sequence<sal_Int8>& aPict,
-			     NSBitmapImageFileType eOutFormat
-			    );
+bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
+			     com::sun::star::uno::Sequence<sal_Int8>& rImgData,
+			     NSBitmapImageFileType eOutFormat);
 
 #endif
+

Modified: openoffice/branches/ia2/main/vcl/aqua/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/ia2/main/vcl/aqua/source/gdi/salgdi.cxx Fri Feb  1 08:46:00 2013
@@ -1096,17 +1096,17 @@ sal_Bool AquaSalGraphics::drawPolyPolygo
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGraphics )
+void AquaSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics *pSrcGraphics )
 {
 	if( !pSrcGraphics )
 		pSrcGraphics = this;
 
     //from unix salgdi2.cxx
     //[FIXME] find a better way to prevent calc from crashing when width and height are negative
-    if( pPosAry->mnSrcWidth <= 0
-        || pPosAry->mnSrcHeight <= 0
-        || pPosAry->mnDestWidth <= 0
-        || pPosAry->mnDestHeight <= 0 )
+    if( rPosAry.mnSrcWidth <= 0
+        || rPosAry.mnSrcHeight <= 0
+        || rPosAry.mnDestWidth <= 0
+        || rPosAry.mnDestHeight <= 0 )
     {
         return;
     }
@@ -1115,16 +1115,16 @@ void AquaSalGraphics::copyBits( const Sa
 	/*const*/ AquaSalGraphics* pSrc = static_cast<AquaSalGraphics*>(pSrcGraphics);
 	const bool bSameGraphics = (this == pSrc) || (mbWindow && mpFrame && pSrc->mbWindow && (mpFrame == pSrc->mpFrame));
 	if( bSameGraphics
-	&&  (pPosAry->mnSrcWidth == pPosAry->mnDestWidth)
-	&&  (pPosAry->mnSrcHeight == pPosAry->mnDestHeight))
+	&&  (rPosAry.mnSrcWidth == rPosAry.mnDestWidth)
+	&&  (rPosAry.mnSrcHeight == rPosAry.mnDestHeight))
 	{
 		// short circuit if there is nothing to do
-		if( (pPosAry->mnSrcX == pPosAry->mnDestX)
-		&&  (pPosAry->mnSrcY == pPosAry->mnDestY))
+		if( (rPosAry.mnSrcX == rPosAry.mnDestX)
+		&&  (rPosAry.mnSrcY == rPosAry.mnDestY))
 			return;
 		// use copyArea() if source and destination context are identical
-		copyArea( pPosAry->mnDestX, pPosAry->mnDestY, pPosAry->mnSrcX, pPosAry->mnSrcY,
-			pPosAry->mnSrcWidth, pPosAry->mnSrcHeight, 0 );
+		copyArea( rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnSrcX, rPosAry.mnSrcY,
+			rPosAry.mnSrcWidth, rPosAry.mnSrcHeight, 0 );
 		return;
 	}
 
@@ -1133,8 +1133,8 @@ void AquaSalGraphics::copyBits( const Sa
 
 	DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from non-layered graphics" );
 
-	const CGPoint aDstPoint = { +pPosAry->mnDestX - pPosAry->mnSrcX, pPosAry->mnDestY - pPosAry->mnSrcY };
-	if( (pPosAry->mnSrcWidth == pPosAry->mnDestWidth && pPosAry->mnSrcHeight == pPosAry->mnDestHeight) &&
+	const CGPoint aDstPoint = { +rPosAry.mnDestX - rPosAry.mnSrcX, rPosAry.mnDestY - rPosAry.mnSrcY };
+	if( (rPosAry.mnSrcWidth == rPosAry.mnDestWidth && rPosAry.mnSrcHeight == rPosAry.mnDestHeight) &&
 	    (!mnBitmapDepth || (aDstPoint.x + pSrc->mnWidth) <= mnWidth) ) // workaround a Quartz crasher
     {
 	    // in XOR mode the drawing context is redirected to the XOR mask
@@ -1145,7 +1145,7 @@ void AquaSalGraphics::copyBits( const Sa
 			    xCopyContext = mpXorEmulation->GetTargetContext();
 
 	    CGContextSaveGState( xCopyContext );
-	    const CGRect aDstRect = { {pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight} };
+	    const CGRect aDstRect = { {rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight} };
 	    CGContextClipToRect( xCopyContext, aDstRect );
 
 	    // draw at new destination
@@ -1160,14 +1160,14 @@ void AquaSalGraphics::copyBits( const Sa
     }
     else
     {
-	    SalBitmap* pBitmap = pSrc->getBitmap( pPosAry->mnSrcX, pPosAry->mnSrcY, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight );
+	    SalBitmap* pBitmap = pSrc->getBitmap( rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight );
 
 	    if( pBitmap )
 	    {
-		    SalTwoRect aPosAry( *pPosAry );
+		    SalTwoRect aPosAry( rPosAry );
 		    aPosAry.mnSrcX = 0;
 		    aPosAry.mnSrcY = 0;
-		    drawBitmap( &aPosAry, *pBitmap );
+		    drawBitmap( aPosAry, *pBitmap );
 		    delete pBitmap;
 	    }
     }
@@ -1192,7 +1192,7 @@ void AquaSalGraphics::copyArea( long nDs
 		aPosAry.mnDestY = nDstY;
 		aPosAry.mnDestWidth = nSrcWidth;
 		aPosAry.mnDestHeight = nSrcHeight;
-		drawBitmap( &aPosAry, *pBitmap );
+		drawBitmap( aPosAry, *pBitmap );
 		delete pBitmap;
 	}
 #else
@@ -1239,17 +1239,17 @@ void AquaSalGraphics::copyArea( long nDs
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap )
+void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap )
 {
 	if( !CheckContext() )
 		return;
 
 	const AquaSalBitmap& rBitmap = static_cast<const AquaSalBitmap&>(rSalBitmap);
-	CGImageRef xImage = rBitmap.CreateCroppedImage( (int)pPosAry->mnSrcX, (int)pPosAry->mnSrcY, (int)pPosAry->mnSrcWidth, (int)pPosAry->mnSrcHeight );
+	CGImageRef xImage = rBitmap.CreateCroppedImage( (int)rPosAry.mnSrcX, (int)rPosAry.mnSrcY, (int)rPosAry.mnSrcWidth, (int)rPosAry.mnSrcHeight );
 	if( !xImage )
 		return;
 
-	const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+	const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
 	CGContextDrawImage( mrContext, aDstRect, xImage );
 	CGImageRelease( xImage );
 	RefreshRect( aDstRect );
@@ -1257,26 +1257,26 @@ void AquaSalGraphics::drawBitmap( const 
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor )
+void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,SalColor )
 {
 	DBG_ERROR("not implemented for color masking!");
-	drawBitmap( pPosAry, rSalBitmap );
+	drawBitmap( rPosAry, rSalBitmap );
 }
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap )
+void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap )
 {
 	if( !CheckContext() )
 		return;
 
 	const AquaSalBitmap& rBitmap = static_cast<const AquaSalBitmap&>(rSalBitmap);
 	const AquaSalBitmap& rMask = static_cast<const AquaSalBitmap&>(rTransparentBitmap);
-	CGImageRef xMaskedImage( rBitmap.CreateWithMask( rMask, pPosAry->mnSrcX, pPosAry->mnSrcY, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight ) );
+	CGImageRef xMaskedImage( rBitmap.CreateWithMask( rMask, rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight ) );
 	if( !xMaskedImage )
 		return;
 
-	const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+	const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
 	CGContextDrawImage( mrContext, aDstRect, xMaskedImage );
 	CGImageRelease( xMaskedImage );
 	RefreshRect( aDstRect );
@@ -1284,17 +1284,17 @@ void AquaSalGraphics::drawBitmap( const 
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::drawMask( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap, SalColor nMaskColor )
+void AquaSalGraphics::drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, SalColor nMaskColor )
 {
 	if( !CheckContext() )
 		return;
 
 	const AquaSalBitmap& rBitmap = static_cast<const AquaSalBitmap&>(rSalBitmap);
-	CGImageRef xImage = rBitmap.CreateColorMask( pPosAry->mnSrcX, pPosAry->mnSrcY, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight, nMaskColor );
+	CGImageRef xImage = rBitmap.CreateColorMask( rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, rPosAry.mnSrcHeight, nMaskColor );
 	if( !xImage )
 		return;
 
-	const CGRect aDstRect = {{pPosAry->mnDestX, pPosAry->mnDestY}, {pPosAry->mnDestWidth, pPosAry->mnDestHeight}};
+	const CGRect aDstRect = {{rPosAry.mnDestX, rPosAry.mnDestY}, {rPosAry.mnDestWidth, rPosAry.mnDestHeight}};
 	CGContextDrawImage( mrContext, aDstRect, xImage );
 	CGImageRelease( xImage );
 	RefreshRect( aDstRect );
@@ -1531,6 +1531,50 @@ bool AquaSalGraphics::drawAlphaBitmap( c
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+bool AquaSalGraphics::drawTransformedBitmap(
+	const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, const basegfx::B2DPoint& rY,
+	const SalBitmap& rSrcBitmap, const SalBitmap* pAlphaBmp )
+{
+	if( !CheckContext() )
+		return true;
+
+	// get the Quartz image
+	CGImageRef xImage = NULL;
+	const Size aSize = rSrcBitmap.GetSize();
+	const AquaSalBitmap& rSrcSalBmp = static_cast<const AquaSalBitmap&>(rSrcBitmap);
+	const AquaSalBitmap* pMaskSalBmp = static_cast<const AquaSalBitmap*>(pAlphaBmp);
+	if( !pMaskSalBmp)
+		xImage = rSrcSalBmp.CreateCroppedImage( 0, 0, (int)aSize.Width(), (int)aSize.Height() );
+	else
+		xImage = rSrcSalBmp.CreateWithMask( *pMaskSalBmp, 0, 0, (int)aSize.Width(), (int)aSize.Height() );
+	if( !xImage )
+		return false;
+
+	// setup the image transformation
+	// using the rNull,rX,rY points as destinations for the (0,0),(0,Width),(Height,0) source points
+	CGContextSaveGState( mrContext );
+	const basegfx::B2DVector aXRel = rX - rNull;
+	const basegfx::B2DVector aYRel = rY - rNull;
+	const CGAffineTransform aCGMat = CGAffineTransformMake(
+		aXRel.getX()/aSize.Width(), aXRel.getY()/aSize.Width(),
+		aYRel.getX()/aSize.Height(), aYRel.getY()/aSize.Height(),
+		rNull.getX(), rNull.getY());
+	CGContextConcatCTM( mrContext, aCGMat );
+
+	// draw the transformed image
+	const CGRect aSrcRect = {{0,0}, {aSize.Width(), aSize.Height()}};
+	CGContextDrawImage( mrContext, aSrcRect, xImage );
+	CGImageRelease( xImage );
+	// restore the Quartz graphics state
+	CGContextRestoreGState(mrContext);
+
+	// mark the destination as painted
+	const CGRect aDstRect = CGRectApplyAffineTransform( aSrcRect, aCGMat );
+	RefreshRect( aDstRect );
+	return true;
+}
+
+// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
                                      long nHeight, sal_uInt8 nTransparency )
 {

Modified: openoffice/branches/ia2/main/vcl/aqua/source/window/salframeview.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/aqua/source/window/salframeview.mm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/aqua/source/window/salframeview.mm (original)
+++ openoffice/branches/ia2/main/vcl/aqua/source/window/salframeview.mm Fri Feb  1 08:46:00 2013
@@ -37,6 +37,14 @@
 
 #define WHEEL_EVENT_FACTOR 1.5
 
+// for allowing fullscreen support on deployment targets < OSX 10.7
+#if !defined(MAC_OS_X_VERSION_10_7)
+    #define NSWindowCollectionBehaviorFullScreenPrimary   (1 << 7)
+    #define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8)
+//  #define NSFullScreenWindowMask (1 << 14)
+#endif
+
+
 static sal_uInt16 ImplGetModifierMask( unsigned int nMask )
 {
     sal_uInt16 nRet = 0;
@@ -153,6 +161,23 @@ static AquaSalFrame* getMouseContainerFr
     pFrame->VCLToCocoa( aRect );
     NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask: mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ];
     [pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are no overlapping subviews within the receiver
+
+    // enable OSX>=10.7 fullscreen options if available and useful
+    bool bAllowFullScreen = (0 == (mpFrame->mnStyle & (SAL_FRAME_STYLE_DIALOG | SAL_FRAME_STYLE_TOOLTIP | SAL_FRAME_STYLE_SYSTEMCHILD | SAL_FRAME_STYLE_FLOAT | SAL_FRAME_STYLE_TOOLWINDOW | SAL_FRAME_STYLE_INTRO)));
+    bAllowFullScreen &= (0 == (~mpFrame->mnStyle & (SAL_FRAME_STYLE_SIZEABLE)));
+    bAllowFullScreen &= (mpFrame->mpParent == NULL);
+    const SEL setCollectionBehavior = @selector(setCollectionBehavior:);
+    if( bAllowFullScreen && [pNSWindow respondsToSelector: setCollectionBehavior])
+    {
+        NSNumber* bMode = [NSNumber numberWithInt:(bAllowFullScreen ? NSWindowCollectionBehaviorFullScreenPrimary : NSWindowCollectionBehaviorFullScreenAuxiliary)];
+        [pNSWindow performSelector:setCollectionBehavior withObject:bMode];
+    }
+
+    // disable OSX>=10.7 window restoration until we support it directly
+    const SEL setRestorable = @selector(setRestorable:);
+    if( [pNSWindow respondsToSelector: setRestorable])
+        [pNSWindow performSelector:setRestorable withObject:NO];
+
     return pNSWindow;
 }
 
@@ -324,6 +349,26 @@ static AquaSalFrame* getMouseContainerFr
     return bRet;
 }
 
+-(void)windowDidEnterFullScreen: (NSNotification*)pNotification
+{
+    YIELD_GUARD;
+
+    if( !mpFrame || !AquaSalFrame::isAlive( mpFrame))
+        return;
+    mpFrame->mbFullScreen = true;
+    (void)pNotification;
+}
+
+-(void)windowDidExitFullScreen: (NSNotification*)pNotification
+{
+    YIELD_GUARD;
+
+    if( !mpFrame || !AquaSalFrame::isAlive( mpFrame))
+        return;
+    mpFrame->mbFullScreen = false;
+    (void)pNotification;
+}
+
 -(void)dockMenuItemTriggered: (id)sender
 {
     (void)sender;

Modified: openoffice/branches/ia2/main/vcl/inc/aqua/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/aqua/salgdi.h?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/aqua/salgdi.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/aqua/salgdi.h Fri Feb  1 08:46:00 2013
@@ -199,15 +199,15 @@ public:
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void		copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
-    virtual void		drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
-    virtual void		drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics );
+    virtual void		drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap );
+    virtual void		drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor );
-    virtual void		drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
                                     const SalBitmap& rTransparentBitmap );
-    virtual void		drawMask( const SalTwoRect* pPosAry,
+    virtual void		drawMask( const SalTwoRect& rPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor );
 
@@ -223,6 +223,12 @@ public:
     virtual bool 			drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
                                              const SalBitmap& rAlphaBitmap );
+    virtual bool drawTransformedBitmap(
+        const basegfx::B2DPoint& rNull,
+        const basegfx::B2DPoint& rX,
+        const basegfx::B2DPoint& rY,
+        const SalBitmap& rSourceBitmap,
+        const SalBitmap* pAlphaBitmap);
 
     virtual bool		    drawAlphaRect( long nX, long nY, long nWidth,
                                            long nHeight, sal_uInt8 nTransparency );

Modified: openoffice/branches/ia2/main/vcl/inc/os2/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/os2/salgdi.h?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/os2/salgdi.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/os2/salgdi.h Fri Feb  1 08:46:00 2013
@@ -182,15 +182,15 @@ protected:
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void		copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
-    virtual void		drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
-    virtual void		drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics );
+    virtual void		drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap );
+    virtual void		drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor );
-    virtual void		drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
                                     const SalBitmap& rTransparentBitmap );
-    virtual void		drawMask( const SalTwoRect* pPosAry,
+    virtual void		drawMask( const SalTwoRect& rPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor );
 
@@ -221,6 +221,12 @@ protected:
     virtual bool		drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
                                          const SalBitmap& rAlphaBitmap );
+    virtual bool drawTransformedBitmap(
+        const basegfx::B2DPoint& rNull,
+        const basegfx::B2DPoint& rX,
+        const basegfx::B2DPoint& rY,
+        const SalBitmap& rSourceBitmap,
+        const SalBitmap* pAlphaBitmap);
     virtual bool		drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
 
 public:

Modified: openoffice/branches/ia2/main/vcl/inc/salgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/salgdi.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/salgdi.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/salgdi.hxx Fri Feb  1 08:46:00 2013
@@ -97,8 +97,9 @@ class VCL_PLUGIN_PUBLIC SalGraphics
 	int						m_nLayout; // 0: mirroring off, 1: mirror x-axis
 
 protected:
+    /// bitfield
     // flags which hold the SetAntialiasing() value from OutputDevice
-    bool                    m_bAntiAliasB2DDraw;
+    bool                    m_bAntiAliasB2DDraw : 1;
 
 public:
     // get/set AA
@@ -135,15 +136,15 @@ protected:
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void		copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ) = 0;
-    virtual void		drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) = 0;
-    virtual void		drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) = 0;
+    virtual void		drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) = 0;
+    virtual void		drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
                                     SalColor nTransparentColor ) = 0;
-    virtual void		drawBitmap( const SalTwoRect* pPosAry,
+    virtual void		drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
                                     const SalBitmap& rMaskBitmap ) = 0;
-    virtual void		drawMask( const SalTwoRect* pPosAry,
+    virtual void		drawMask( const SalTwoRect& rPosAry,
                                   const SalBitmap& rSalBitmap,
                                   SalColor nMaskColor ) = 0;
 
@@ -184,6 +185,15 @@ protected:
     virtual bool		drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
                                          const SalBitmap& rAlphaBitmap ) = 0;
+
+    /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the coordinate system */
+    virtual bool drawTransformedBitmap(
+        const basegfx::B2DPoint& rNull,
+        const basegfx::B2DPoint& rX,
+        const basegfx::B2DPoint& rY,
+        const SalBitmap& rSourceBitmap,
+        const SalBitmap* pAlphaBitmap) = 0;
+
     /** Render solid rectangle with given transparency
 
         @param nTransparency
@@ -401,23 +411,23 @@ public:
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    void                    CopyBits( const SalTwoRect* pPosAry,
+    void                    CopyBits( const SalTwoRect& rPosAry,
                                       SalGraphics* pSrcGraphics,
                                       const OutputDevice *pOutDev,
                                       const OutputDevice *pSrcOutDev );
-    void                    DrawBitmap( const SalTwoRect* pPosAry,
+    void                    DrawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const OutputDevice *pOutDev );
-    void                    DrawBitmap( const SalTwoRect* pPosAry,
+    void                    DrawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         SalColor nTransparentColor,
                                         const OutputDevice *pOutDev );
-    void                    DrawBitmap( const SalTwoRect* pPosAry,
+    void                    DrawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rTransparentBitmap,
                                         const OutputDevice *pOutDev );
 
-    void                    DrawMask( const SalTwoRect* pPosAry,
+    void                    DrawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
                                       SalColor nMaskColor,
                                       const OutputDevice *pOutDev );
@@ -485,6 +495,14 @@ public:
                           const SalBitmap& rAlphaBitmap,
                           const OutputDevice *pOutDev );
 
+    bool DrawTransformedBitmap(
+        const basegfx::B2DPoint& rNull,
+        const basegfx::B2DPoint& rX,
+        const basegfx::B2DPoint& rY,
+        const SalBitmap& rSourceBitmap,
+        const SalBitmap* pAlphaBitmap,
+        const OutputDevice* pOutDev );
+
     bool DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, 
                         sal_uInt8 nTransparency, const OutputDevice *pOutDev );
 

Modified: openoffice/branches/ia2/main/vcl/inc/unx/gtk/gtkgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/gtk/gtkgdi.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/gtk/gtkgdi.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/gtk/gtkgdi.hxx Fri Feb  1 08:46:00 2013
@@ -81,7 +81,7 @@ public:
     // a control is painted; but presentation effects need
     // the background set to None; workaround: set the background
     // before copyBits
-    virtual void			copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect& rPosAry,
                                       SalGraphics* pSrcGraphics );
 
 protected:

Modified: openoffice/branches/ia2/main/vcl/inc/unx/pspgraphics.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/pspgraphics.h?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/pspgraphics.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/pspgraphics.h Fri Feb  1 08:46:00 2013
@@ -159,17 +159,17 @@ public:
                                       long nSrcWidth,
                                       long nSrcHeight,
                                       sal_uInt16 nFlags );
-    virtual void			copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect& rPosAry,
                                       SalGraphics* pSrcGraphics );
-    virtual void			drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap );
-    virtual void			drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         SalColor nTransparentColor );
-    virtual void			drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rTransparentBitmap );
-    virtual void			drawMask( const SalTwoRect* pPosAry,
+    virtual void			drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
                                       SalColor nMaskColor );
     virtual SalBitmap*		getBitmap( long nX, long nY, long nWidth, long nHeight );
@@ -183,6 +183,12 @@ public:
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
                                              const SalBitmap& rAlphaBitmap );
+    virtual bool drawTransformedBitmap(
+        const basegfx::B2DPoint& rNull,
+        const basegfx::B2DPoint& rX,
+        const basegfx::B2DPoint& rY,
+        const SalBitmap& rSourceBitmap,
+        const SalBitmap* pAlphaBitmap);
     virtual bool            drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
 
     virtual SystemGraphicsData GetGraphicsData() const;    

Modified: openoffice/branches/ia2/main/vcl/inc/unx/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/unx/salgdi.h?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/unx/salgdi.h (original)
+++ openoffice/branches/ia2/main/vcl/inc/unx/salgdi.h Fri Feb  1 08:46:00 2013
@@ -175,7 +175,7 @@ protected:
                                 int          &nSrcY,
                                 Pixmap        hClipMask );
     using SalGraphics::DrawBitmap;
-    void            DrawBitmap( const SalTwoRect *pPosAry,
+    void            DrawBitmap( const SalTwoRect& rPosAry,
                                 SalGraphics      *pThis,
                                 const SalBitmap  &rSalBitmap,
                                 const SalBitmap  &rTransparentBitmap,
@@ -184,7 +184,7 @@ protected:
     GC                      GetFontGC();
     bool                    setFont( const ImplFontSelectData* pEntry, int nFallbackLevel );
 
-    void                    drawMaskedBitmap( const SalTwoRect* pPosAry,
+    void                    drawMaskedBitmap( const SalTwoRect& rPosAry,
                                               const SalBitmap& rSalBitmap,
                                               const SalBitmap& rTransparentBitmap );
 
@@ -312,17 +312,17 @@ public:
                                       long nSrcWidth,
                                       long nSrcHeight,
                                       sal_uInt16 nFlags );
-    virtual void			copyBits( const SalTwoRect* pPosAry,
+    virtual void			copyBits( const SalTwoRect& rPosAry,
                                       SalGraphics* pSrcGraphics );
-    virtual void			drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap );
-    virtual void			drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         SalColor nTransparentColor );
-    virtual void			drawBitmap( const SalTwoRect* pPosAry,
+    virtual void			drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rMaskBitmap );
-    virtual void			drawMask( const SalTwoRect* pPosAry,
+    virtual void			drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
                                       SalColor nMaskColor );
     virtual SalBitmap*		getBitmap( long nX, long nY, long nWidth, long nHeight );
@@ -335,6 +335,12 @@ public:
     virtual bool 			drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
                                              const SalBitmap& rAlphaBitmap );
+    virtual bool drawTransformedBitmap(
+        const basegfx::B2DPoint& rNull,
+        const basegfx::B2DPoint& rX,
+        const basegfx::B2DPoint& rY,
+        const SalBitmap& rSourceBitmap,
+        const SalBitmap* pAlphaBitmap);
 
     virtual bool		    drawAlphaRect( long nX, long nY, long nWidth, 
                                            long nHeight, sal_uInt8 nTransparency );

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/alpha.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/alpha.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/alpha.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/alpha.hxx Fri Feb  1 08:46:00 2013
@@ -36,11 +36,10 @@ class BitmapEx;
 
 class VCL_DLLPUBLIC AlphaMask : private Bitmap
 {
+private:
 	friend class BitmapEx;
 	friend class OutputDevice;
-	friend VCL_DLLPUBLIC SvStream& operator<<( SvStream&, const ImageList& );
-
-private:
+    friend bool VCL_DLLPUBLIC ReadDIBBitmapEx(BitmapEx& rTarget, SvStream& rIStm);
 
 	SAL_DLLPRIVATE const Bitmap&    ImplGetBitmap() const;
 	SAL_DLLPRIVATE void             ImplSetBitmap( const Bitmap& rBitmap );
@@ -51,7 +50,7 @@ public:
 							AlphaMask( const Bitmap& rBitmap );
                             AlphaMask( const AlphaMask& rAlphaMask );
                             AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = NULL );
-                            ~AlphaMask();
+    virtual                 ~AlphaMask();
 
     AlphaMask&				operator=( const Bitmap& rBitmap );
 	AlphaMask&				operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); }
@@ -97,14 +96,7 @@ public:
     BitmapReadAccess*		AcquireReadAccess() { return Bitmap::AcquireReadAccess(); }
     BitmapWriteAccess*		AcquireWriteAccess() { return Bitmap::AcquireWriteAccess(); }
     void					ReleaseAccess( BitmapReadAccess* pAccess );
-
-public:
-
-    sal_Bool					Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True ) { return Bitmap::Read( rIStm, bFileHeader ); }
-	sal_Bool					Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }
-
-	friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
-	friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
 };
 
 #endif // _SV_ALPHA_HXX
+// eof

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/bitmap.hxx Fri Feb  1 08:46:00 2013
@@ -343,8 +343,6 @@ class   BitmapWriteAccess;
 class   BitmapPalette;
 class   ImpBitmap;
 class   Color;
-class   SvStream;
-struct  DIBInfoHeader;
 class   ResId;
 class	GDIMetaFile;
 class	AlphaMask;
@@ -383,20 +381,6 @@ public:
     SAL_DLLPRIVATE void                 ImplSetImpBitmap( ImpBitmap* pImpBmp );
     SAL_DLLPRIVATE void                 ImplAssignWithSize( const Bitmap& rBitmap );
 
-    SAL_DLLPRIVATE static sal_Bool          ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset );
-    SAL_DLLPRIVATE static sal_Bool          ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset );
-    SAL_DLLPRIVATE static sal_Bool          ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown );
-    SAL_DLLPRIVATE static sal_Bool          ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad );
-    SAL_DLLPRIVATE static sal_Bool          ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown );
-    SAL_DLLPRIVATE sal_Bool                 ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bCompressed ) const;
-    SAL_DLLPRIVATE static sal_Bool          ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc );
-    SAL_DLLPRIVATE static sal_Bool          ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc );
-    SAL_DLLPRIVATE static sal_Bool          ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
-                                                             sal_uLong nCompression, sal_uInt32& rImageSize );
-    SAL_DLLPRIVATE static void          ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader,
-                                           BitmapWriteAccess& rAcc, sal_Bool bRLE4 );
-    SAL_DLLPRIVATE static sal_Bool          ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 );
-
     SAL_DLLPRIVATE void                     ImplAdaptBitCount(Bitmap& rNew) const;
     SAL_DLLPRIVATE sal_Bool                 ImplScaleFast( const double& rScaleX, const double& rScaleY );
     SAL_DLLPRIVATE sal_Bool                 ImplScaleInterpolate( const double& rScaleX, const double& rScaleY );
@@ -436,7 +420,7 @@ public:
                             Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = NULL );
                             Bitmap( const ResId& rResId );
                             Bitmap( SalBitmap* pSalBitmap );
-                            ~Bitmap();
+    virtual                 ~Bitmap();
 
     Bitmap&                 operator=( const Bitmap& rBitmap );
     inline sal_Bool             operator!() const;
@@ -878,18 +862,9 @@ public:
 									const BmpFilterParam* pFilterParam = NULL,
 									const Link* pProgress = NULL );
 
-public:
     BitmapReadAccess*       AcquireReadAccess();
     BitmapWriteAccess*      AcquireWriteAccess();
     void                    ReleaseAccess( BitmapReadAccess* pAccess );
-
-public:
-
-    sal_Bool                    Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True );
-    sal_Bool                    Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const;
-
-    friend VCL_DLLPUBLIC SvStream&        operator>>( SvStream& rIStm, Bitmap& rBitmap );
-    friend VCL_DLLPUBLIC SvStream&        operator<<( SvStream& rOStm, const Bitmap& rBitmap );
 };
 
 // -----------

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/bitmapex.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/bitmapex.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/bitmapex.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/bitmapex.hxx Fri Feb  1 08:46:00 2013
@@ -28,6 +28,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
 #include <tools/color.hxx>
+#include <basegfx/color/bcolormodifier.hxx>
 
 // -------------------
 // - TransparentType -
@@ -46,9 +47,9 @@ enum TransparentType
 
 class VCL_DLLPUBLIC BitmapEx
 {
-	friend class ImpGraphic;
-
 private:
+	friend class ImpGraphic;
+    friend bool VCL_DLLPUBLIC WriteDIBBitmapEx(const BitmapEx& rSource, SvStream& rOStm);
 
 	Bitmap				aBitmap;
 	Bitmap				aMask;
@@ -59,15 +60,9 @@ private:
 
 public:
 
-//#if 0 // _SOLAR__PRIVATE
-
     SAL_DLLPRIVATE  ImpBitmap*  ImplGetBitmapImpBitmap() const { return aBitmap.ImplGetImpBitmap(); }
     SAL_DLLPRIVATE  ImpBitmap*  ImplGetMaskImpBitmap() const { return aMask.ImplGetImpBitmap(); }
 
-//#endif // PRIVATE
-
-public:
-
 						BitmapEx();
 						BitmapEx( const ResId& rResId );
 						BitmapEx( const BitmapEx& rBitmapEx );
@@ -387,10 +382,43 @@ public:
      */
     sal_uInt8 GetTransparency(sal_Int32 nX, sal_Int32 nY) const;
 
-public:
+    /** Create transformed Bitmap
+        
+        @param fWidth
+        The target width in pixels
+
+        @param fHeight
+        The target height in pixels
 
-	friend VCL_DLLPUBLIC SvStream&	operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );
-	friend VCL_DLLPUBLIC SvStream&	operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );
+        @param rTransformation
+        The back transformation for each pixel in (0 .. fWidth),(0 .. fHeight) to
+        local pixel coordiantes
+    */
+    BitmapEx TransformBitmapEx(
+        double fWidth,
+        double fHeight,
+        const basegfx::B2DHomMatrix& rTransformation) const;
+
+    /** Create transformed Bitmap
+
+        @param rTransformation
+        The transformation from unit coordinates to target
+
+        @param fMaximumArea
+        A limitation for the maximum size of pixels to use for the result
+
+        @return The transformed bitmap
+    */
+    BitmapEx getTransformed(
+        const basegfx::B2DHomMatrix& rTransformation, 
+        double fMaximumArea = 500000.0) const;
+
+    /** Create ColorStack-modified version of this BitmapEx
+
+        @param rBColorModifierStack
+        A ColrModifierStack which defines how each pixel has to be modified
+    */
+    BitmapEx ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const;
 };
 
 #endif // _SV_BITMAPEX_HXX

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/button.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/button.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/button.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/button.hxx Fri Feb  1 08:46:00 2013
@@ -66,12 +66,12 @@ public:
     SAL_DLLPRIVATE void             ImplSetSymbolRect(const Rectangle&);
 
 protected:
-                        Button( WindowType nType );
+    explicit            Button( WindowType nType );
 
 public:
-                        Button( Window* pParent, WinBits nStyle = 0 );
-                        Button( Window* pParent, const ResId& rResId );
-                       ~Button();
+    explicit            Button( Window* pParent, WinBits nStyle = 0 );
+    explicit            Button( Window* pParent, const ResId& );
+    virtual             ~Button();
 
     virtual void        Click();
 
@@ -149,7 +149,7 @@ public:
     SAL_DLLPRIVATE sal_Bool            ImplIsDefButton() const;
 
 protected:
-                    PushButton( WindowType nType );
+    explicit        PushButton( WindowType nType );
 
     virtual void    FillLayoutData() const;
     virtual const Font&
@@ -157,9 +157,9 @@ protected:
     virtual const Color&
                     GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
 public:
-                    PushButton( Window* pParent, WinBits nStyle = 0 );
-                    PushButton( Window* pParent, const ResId& rResId );
-                    ~PushButton();
+    explicit        PushButton( Window* pParent, WinBits nStyle = 0 );
+    explicit        PushButton( Window* pParent, const ResId& );
+    virtual         ~PushButton();
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual void    Tracking( const TrackingEvent& rTEvt );
@@ -232,8 +232,8 @@ private:
 	SAL_DLLPRIVATE                 OKButton & operator= (const OKButton &);
 
 public:
-                    OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON );
-                    OKButton( Window* pParent, const ResId& rResId );
+    explicit        OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON );
+    explicit        OKButton( Window* pParent, const ResId& );
 
     virtual void    Click();
 };
@@ -254,8 +254,8 @@ private:
 	SAL_DLLPRIVATE      CancelButton & operator= (const CancelButton &);
 
 public:
-                    CancelButton( Window* pParent, WinBits nStyle = 0 );
-                    CancelButton( Window* pParent, const ResId& rResId );
+    explicit        CancelButton( Window* pParent, WinBits nStyle = 0 );
+    explicit        CancelButton( Window* pParent, const ResId& );
 
     virtual void    Click();
 };
@@ -276,8 +276,8 @@ private:
 	SAL_DLLPRIVATE      HelpButton & operator= ( const HelpButton & );
 
 public:
-                    HelpButton( Window* pParent, WinBits nStyle = 0 );
-                    HelpButton( Window* pParent, const ResId& rResId );
+    explicit        HelpButton( Window* pParent, WinBits nStyle = 0 );
+    explicit        HelpButton( Window* pParent, const ResId& );
 
     virtual void    Click();
 };
@@ -344,9 +344,9 @@ protected:
     void			DrawRadioButtonState( );
 
 public:
-                    RadioButton( Window* pParent, WinBits nWinStyle = 0 );
-                    RadioButton( Window* pParent, const ResId& rResId );
-                    ~RadioButton();
+    explicit        RadioButton( Window* pParent, WinBits nWinStyle = 0 );
+    explicit        RadioButton( Window* pParent, const ResId& );
+    virtual         ~RadioButton();
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual void    Tracking( const TrackingEvent& rTEvt );
@@ -450,8 +450,8 @@ public:
     SAL_DLLPRIVATE void         ImplCheck();    
     SAL_DLLPRIVATE void         ImplSetMinimumNWFSize();
 public:
-                    CheckBox( Window* pParent, WinBits nStyle = 0 );
-                    CheckBox( Window* pParent, const ResId& rResId );
+    explicit        CheckBox( Window* pParent, WinBits nStyle = 0 );
+    explicit        CheckBox( Window* pParent, const ResId& );
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual void    Tracking( const TrackingEvent& rTEvt );
@@ -515,12 +515,12 @@ private:
 	SAL_DLLPRIVATE          ImageButton & operator= ( const ImageButton & );
 
 protected:
-                    ImageButton( WindowType nType );
+    explicit        ImageButton( WindowType nType );
 
 public:
-                    ImageButton( Window* pParent, WinBits nStyle = 0 );
-                    ImageButton( Window* pParent, const ResId& rResId );
-                    ~ImageButton();
+    explicit        ImageButton( Window* pParent, WinBits nStyle = 0 );
+    explicit        ImageButton( Window* pParent, const ResId& );
+    virtual         ~ImageButton();
 };
 
 class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
@@ -530,9 +530,9 @@ class VCL_DLLPUBLIC ImageRadioButton : p
 	SAL_DLLPRIVATE  ImageRadioButton & operator= ( const ImageRadioButton & );
 
 public:
-                    ImageRadioButton( Window* pParent, WinBits nStyle = 0 );
-                    ImageRadioButton( Window* pParent, const ResId& rResId );
-                    ~ImageRadioButton();
+    explicit        ImageRadioButton( Window* pParent, WinBits nStyle = 0 );
+    explicit        ImageRadioButton( Window* pParent, const ResId& );
+    virtual         ~ImageRadioButton();
 };
 
 class VCL_DLLPUBLIC TriStateBox : public CheckBox
@@ -542,9 +542,9 @@ class VCL_DLLPUBLIC TriStateBox : public
 	SAL_DLLPRIVATE  TriStateBox & operator= ( const TriStateBox & );
 
 public:
-            TriStateBox( Window* pParent, WinBits nStyle = 0 );
-            TriStateBox( Window* pParent, const ResId& rResId );
-            ~TriStateBox();
+    explicit        TriStateBox( Window* pParent, WinBits nStyle = 0 );
+    explicit        TriStateBox( Window* pParent, const ResId& );
+    virtual         ~TriStateBox();
 };
 
 class VCL_DLLPUBLIC DisclosureButton : public CheckBox
@@ -552,10 +552,11 @@ class VCL_DLLPUBLIC DisclosureButton : p
 protected:
     SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
 public:
-    DisclosureButton( Window* pParent, WinBits nStyle = 0 );
-    DisclosureButton( Window* pParent, const ResId& rResId );
+    explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 );
+    explicit DisclosureButton( Window* pParent, const ResId& );
 
     virtual void    KeyInput( const KeyEvent& rKEvt );
 };
 
 #endif  // _SV_BUTTON_HXX
+

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/combobox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/combobox.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/combobox.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/combobox.hxx Fri Feb  1 08:46:00 2013
@@ -80,14 +80,14 @@ protected:
 //#endif
 
 protected:
-                    ComboBox( WindowType nType );
+    explicit            ComboBox( WindowType nType );
     sal_Bool            IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; }
 
     virtual void  FillLayoutData() const;
 public:
-                    ComboBox( Window* pParent, WinBits nStyle = 0 );
-                    ComboBox( Window* pParent, const ResId& rResId );
-                    ~ComboBox();
+    explicit        ComboBox( Window* pParent, WinBits nStyle = 0 );
+    explicit        ComboBox( Window* pParent, const ResId& );
+    virtual         ~ComboBox();
 
     virtual void    Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
     virtual void    Resize();
@@ -232,3 +232,4 @@ public:
 };
 
 #endif  // _COMBOBOX_HXX
+

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/ctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/ctrl.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/ctrl.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/ctrl.hxx Fri Feb  1 08:46:00 2013
@@ -130,9 +130,9 @@ public:
 //#endif    
 
 public:
-					Control( Window* pParent, WinBits nWinStyle = 0 );
-					Control( Window* pParent, const ResId& rResId );
-    				~Control();
+	explicit		Control( Window* pParent, WinBits nWinStyle = 0 );
+	explicit		Control( Window* pParent, const ResId& );
+	virtual			~Control();
 
 	virtual void	GetFocus();
 	virtual void	LoseFocus();

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/dialog.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/dialog.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/dialog.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/dialog.hxx Fri Feb  1 08:46:00 2013
@@ -74,8 +74,8 @@ protected:
 	virtual void	Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
 
 public:
-					Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
-					Dialog( Window* pParent, const ResId& rResId );
+	explicit		Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
+	explicit		Dialog( Window* pParent, const ResId& );
     virtual         ~Dialog();
 
 	virtual long	Notify( NotifyEvent& rNEvt );
@@ -128,8 +128,8 @@ class VCL_DLLPUBLIC ModelessDialog : pub
 //#endif
 
 public:
-					ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS );
-					ModelessDialog( Window* pParent, const ResId& rResId );
+	explicit		ModelessDialog( Window* pParent, WinBits nStyle = WB_STDMODELESS );
+	explicit		ModelessDialog( Window* pParent, const ResId& );
 };
 
 // ---------------
@@ -139,8 +139,8 @@ public:
 class VCL_DLLPUBLIC ModalDialog : public Dialog
 {
 public:
-					ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
-					ModalDialog( Window* pParent, const ResId& rResId );
+	explicit		ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
+	explicit		ModalDialog( Window* pParent, const ResId& );
 
 private:
     using Window::Show;
@@ -156,3 +156,4 @@ private:
 };
 
 #endif	// _SV_DIALOG_HXX
+

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/dockingarea.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/dockingarea.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/dockingarea.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/dockingarea.hxx Fri Feb  1 08:46:00 2013
@@ -44,8 +44,8 @@ private:
 	SAL_DLLPRIVATE  DockingAreaWindow & operator= (const DockingAreaWindow &);
 
 public:
-                    DockingAreaWindow( Window *pParent );
-                    ~DockingAreaWindow();
+    explicit        DockingAreaWindow( Window* pParent );
+    virtual         ~DockingAreaWindow();
 
     void            SetAlign( WindowAlign eNewAlign );
     WindowAlign     GetAlign() const;

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/event.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/event.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/event.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/event.hxx Fri Feb  1 08:46:00 2013
@@ -128,8 +128,8 @@ private:
     sal_uInt16          mnCode;
 
 public:
-                    MouseEvent();
-                    MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1,
+    explicit        MouseEvent();
+    explicit        MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1,
                                 sal_uInt16 nMode = 0, sal_uInt16 nButtons = 0,
                                 sal_uInt16 nModifier = 0 );
 
@@ -207,9 +207,9 @@ private:
     sal_Bool            mbKeyboardActivated;
 
 public:
-                    HelpEvent();
-                    HelpEvent( sal_uInt16 nHelpMode );
-                    HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode );
+    explicit        HelpEvent();
+    explicit        HelpEvent( sal_uInt16 nHelpMode );
+    explicit        HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode );
 
     const Point&    GetMousePosPixel() const;
     sal_uInt16          GetMode() const { return mnMode; }
@@ -300,8 +300,8 @@ private:
     sal_uInt16              mnFlags;
 
 public:
-                        TrackingEvent();
-                        TrackingEvent( const MouseEvent& rMEvt,
+    explicit            TrackingEvent();
+    explicit            TrackingEvent( const MouseEvent&,
                                        sal_uInt16 nTrackFlags = 0 );
 
     const MouseEvent&   GetMouseEvent() const { return maMEvt; }
@@ -435,8 +435,8 @@ private:
     sal_uInt16                  mnType;
 
 public:
-                            DataChangedEvent();
-                            DataChangedEvent( sal_uInt16 nType,
+    explicit                DataChangedEvent();
+    explicit                DataChangedEvent( sal_uInt16 nType,
                                               const void* pData = NULL,
                                               sal_uLong nFlags = 0 );
 

Modified: openoffice/branches/ia2/main/vcl/inc/vcl/field.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/field.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/field.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/field.hxx Fri Feb  1 08:46:00 2013
@@ -64,7 +64,7 @@ protected:
     sal_Bool                    IsDefaultLocale() const { return mbDefaultLocale; }
 
 public:
-                            FormatterBase( Edit* pField = NULL );
+    explicit                FormatterBase( Edit* pField = NULL );
     virtual                 ~FormatterBase();
 
     const LocaleDataWrapper& GetLocaleDataWrapper() const;
@@ -502,9 +502,9 @@ public:
 class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter
 {
 public:
-                            PatternField( Window* pParent, WinBits nWinStyle );
-                            PatternField( Window* pParent, const ResId& rResId );
-                            ~PatternField();
+    explicit                PatternField( Window* pParent, WinBits nWinStyle );
+    explicit                PatternField( Window* pParent, const ResId& );
+    virtual                 ~PatternField();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -522,9 +522,9 @@ protected:
     SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
 
 public:
-                            NumericField( Window* pParent, WinBits nWinStyle );
-                            NumericField( Window* pParent, const ResId& rResId );
-                            ~NumericField();
+    explicit                NumericField( Window* pParent, WinBits nWinStyle );
+    explicit                NumericField( Window* pParent, const ResId& );
+    virtual                 ~NumericField();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -549,9 +549,9 @@ protected:
     SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
 
 public:
-                            MetricField( Window* pParent, WinBits nWinStyle );
-                            MetricField( Window* pParent, const ResId& rResId );
-                            ~MetricField();
+    explicit                MetricField( Window* pParent, WinBits nWinStyle );
+    explicit                MetricField( Window* pParent, const ResId& );
+    virtual                 ~MetricField();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -616,9 +616,9 @@ protected:
     SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
 
 public:
-                            CurrencyField( Window* pParent, WinBits nWinStyle );
-                            CurrencyField( Window* pParent, const ResId& rResId );
-                            ~CurrencyField();
+    explicit                CurrencyField( Window* pParent, WinBits nWinStyle );
+    explicit                CurrencyField( Window* pParent, const ResId& );
+    virtual                 ~CurrencyField();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -648,9 +648,9 @@ protected:
     SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
 
 public:
-                            DateField( Window* pParent, WinBits nWinStyle );
-                            DateField( Window* pParent, const ResId& rResId );
-                            ~DateField();
+    explicit                DateField( Window* pParent, WinBits nWinStyle );
+    explicit                DateField( Window* pParent, const ResId& );
+    virtual                 ~DateField();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -684,9 +684,9 @@ protected:
     SAL_DLLPRIVATE void     ImplLoadRes( const ResId& rResId );
 
 public:
-                            TimeField( Window* pParent, WinBits nWinStyle );
-                            TimeField( Window* pParent, const ResId& rResId );
-                            ~TimeField();
+    explicit                TimeField( Window* pParent, WinBits nWinStyle );
+    explicit                TimeField( Window* pParent, const ResId& );
+    virtual                 ~TimeField();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -715,9 +715,9 @@ public:
 class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter
 {
 public:
-                            PatternBox( Window* pParent, WinBits nWinStyle );
-                            PatternBox( Window* pParent, const ResId& rResId );
-                            ~PatternBox();
+    explicit                PatternBox( Window* pParent, WinBits nWinStyle );
+    explicit                PatternBox( Window* pParent, const ResId& );
+    virtual                 ~PatternBox();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -742,9 +742,9 @@ public:
 class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
 {
 public:
-                            NumericBox( Window* pParent, WinBits nWinStyle );
-                            NumericBox( Window* pParent, const ResId& rResId );
-                            ~NumericBox();
+    explicit                NumericBox( Window* pParent, WinBits nWinStyle );
+    explicit                NumericBox( Window* pParent, const ResId& );
+    virtual                 ~NumericBox();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -769,9 +769,9 @@ public:
 class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter
 {
 public:
-                            MetricBox( Window* pParent, WinBits nWinStyle );
-                            MetricBox( Window* pParent, const ResId& rResId );
-                            ~MetricBox();
+    explicit                MetricBox( Window* pParent, WinBits nWinStyle );
+    explicit                MetricBox( Window* pParent, const ResId& );
+    virtual                 ~MetricBox();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -802,9 +802,9 @@ public:
 class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
 {
 public:
-                            CurrencyBox( Window* pParent, WinBits nWinStyle );
-                            CurrencyBox( Window* pParent, const ResId& rResId );
-                            ~CurrencyBox();
+    explicit                CurrencyBox( Window* pParent, WinBits nWinStyle );
+    explicit                CurrencyBox( Window* pParent, const ResId& );
+    virtual                 ~CurrencyBox();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -831,9 +831,9 @@ public:
 class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter
 {
 public:
-                            DateBox( Window* pParent, WinBits nWinStyle );
-                            DateBox( Window* pParent, const ResId& rResId );
-                            ~DateBox();
+    explicit                DateBox( Window* pParent, WinBits nWinStyle );
+    explicit                DateBox( Window* pParent, const ResId& );
+    virtual                 ~DateBox();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );
@@ -858,9 +858,9 @@ public:
 class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter
 {
 public:
-                            TimeBox( Window* pParent, WinBits nWinStyle );
-                            TimeBox( Window* pParent, const ResId& rResId );
-                            ~TimeBox();
+    explicit                TimeBox( Window* pParent, WinBits nWinStyle );
+    explicit                TimeBox( Window* pParent, const ResId& );
+    virtual                 ~TimeBox();
 
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual long            Notify( NotifyEvent& rNEvt );



Mime
View raw message