[Libreoffice-commits] core.git: 3 commits - vcl/source vcl/unx

[Thorsten Behrens]

 vcl/source/gdi/mapmod.cxx                   |   17 ++++++++---------
 vcl/unx/generic/dtrans/X11_selection.cxx    |    3 ++-
 vcl/unx/generic/dtrans/X11_transferable.cxx |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 5f293414d62ac93fc150a44f070980a808469ab1
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue Nov 15 03:54:10 2016 +0100

    vcl: include redux in MapMode
    
    Change-Id: Icc43510a3e561b426319465ea98eb374a3aa1f8d

diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 9a804b0..422d6d8 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -23,7 +23,6 @@
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
-#include <tools/debug.hxx>
 #include <rtl/instance.hxx>
 
 struct MapMode::ImplMapMode
commit 30d6397809b741a49198497dea22d05336d17801
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue Nov 15 03:49:33 2016 +0100

    vcl: cleanup whitespace in MapMode
    
    Change-Id: Ib790bab105c337d62ffc93f72bf6da49a74f00cf

diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index e981a5d..9a804b0 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -49,8 +49,8 @@ MapMode::ImplMapMode::ImplMapMode() :
     maScaleX( 1, 1 ),
     maScaleY( 1, 1 )
 {
-    meUnit      = MapUnit::MapPixel;
-    mbSimple    = true;
+    meUnit   = MapUnit::MapPixel;
+    mbSimple = true;
 }
 
 MapMode::ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) :
@@ -64,7 +64,7 @@ MapMode::ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) :
 
 bool MapMode::ImplMapMode::operator==( const ImplMapMode& rImpMapMode ) const
 {
-    if (meUnit   == rImpMapMode.meUnit
+    if (meUnit == rImpMapMode.meUnit
         && maOrigin == rImpMapMode.maOrigin
         && maScaleX == rImpMapMode.maScaleX
         && maScaleY == rImpMapMode.maScaleY)
@@ -88,7 +88,7 @@ MapMode::MapMode( const MapMode& rMapMode ) : mpImplMapMode( rMapMode.mpImplMapM
 
 MapMode::MapMode( MapUnit eUnit ) : mpImplMapMode()
 {
-    mpImplMapMode->meUnit   = eUnit;
+    mpImplMapMode->meUnit = eUnit;
 }
 
 MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg,
@@ -100,7 +100,7 @@ MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg,
     mpImplMapMode->maScaleY = rScaleY;
     mpImplMapMode->maScaleX.ReduceInaccurate(32);
     mpImplMapMode->maScaleY.ReduceInaccurate(32);
-    mpImplMapMode->mbSimple    = false;
+    mpImplMapMode->mbSimple = false;
 }
 
 MapMode::~MapMode()
@@ -131,7 +131,7 @@ void MapMode::SetScaleY( const Fraction& rScaleY )
 
 double MapMode::GetUnitMultiplier() const
 {
-    double  nMul;
+    double nMul;
     switch ( GetMapUnit() )
     {
         case MapUnit::MapPixel :
@@ -199,8 +199,8 @@ bool MapMode::IsDefault() const
 
 SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode )
 {
-    VersionCompat   aCompat( rIStm, StreamMode::READ );
-    sal_uInt16          nTmp16;
+    VersionCompat aCompat( rIStm, StreamMode::READ );
+    sal_uInt16    nTmp16;
 
     rIStm.ReadUInt16( nTmp16 ); rMapMode.mpImplMapMode->meUnit = (MapUnit) nTmp16;
     ReadPair( rIStm, rMapMode.mpImplMapMode->maOrigin );
commit d55bbd9ea2e37bf902894a6eeb1560cc981f182e
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue Nov 15 03:30:52 2016 +0100

    vcl: add/unify some clipboard SAL_INFO tracing
    
    Change-Id: I4989da02cbc82d253a486a7adde95551eddb45b3

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index cca391c..969dfe4 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -769,6 +769,7 @@ void SelectionManager::convertTypeToNative( const OUString& rType, Atom selectio
     int nTabEntries = selection == m_nXdndSelection ? SAL_N_ELEMENTS(aXdndConversionTab) : SAL_N_ELEMENTS(aNativeConversionTab);
 
     OString aType( OUStringToOString( rType, RTL_TEXTENCODING_ISO_8859_1 ) );
+    SAL_INFO( "vcl.unx.dtrans", "convertTypeToNative " << aType );
     rFormat = 0;
     for( int i = 0; i < nTabEntries; i++ )
     {
@@ -1457,7 +1458,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
                     // conversion succeeded, so aData contains image/bmp now
                     if( pPixmap->needsConversion( reinterpret_cast<const sal_uInt8*>(aData.getConstArray()) ) )
                     {
-                        SAL_INFO( "vcl", "trying bitmap conversion" );
+                        SAL_INFO( "vcl.unx.dtrans", "trying bitmap conversion" );
                         int depth = pPixmap->getDepth();
                         aGuard.clear();
                         aData = convertBitmapDepth(aData, depth);
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 9bd683d..9e6714c 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -62,7 +62,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor )
         if( reinterpret_cast<sal_Unicode const *>(aData.getConstArray())[nLen-1] == 0 )
             nLen--;
         OUString aString( reinterpret_cast<sal_Unicode const *>(aData.getConstArray()), nLen );
-        SAL_INFO( "vcl", "X11Transferable::getTransferData( \"" << rFlavor.MimeType << "\" )\n -> \"" << aString << "\"\n");
+        SAL_INFO( "vcl.unx.dtrans", "X11Transferable::getTransferData( \"" << rFlavor.MimeType << "\" )\n -> \"" << aString << "\"\n");
         aRet <<= aString.replaceAll("\r\n", "\n");
     }
     else