[Libreoffice-commits] core.git: 3 commits - offapi/com vcl/headless vcl/source

Caolán McNamara caolanm at redhat.com
Fri Nov 13 12:35:34 PST 2015


 offapi/com/sun/star/configuration/AccessRootElement.idl |    4 ++--
 offapi/com/sun/star/configuration/SetElement.idl        |    2 +-
 offapi/com/sun/star/configuration/UpdateRootElement.idl |    4 ++--
 offapi/com/sun/star/deployment/XPackageRegistry.idl     |    2 --
 offapi/com/sun/star/table/TableSortField.idl            |    4 ++--
 vcl/headless/svpgdi.cxx                                 |   13 -------------
 vcl/source/gdi/jobset.cxx                               |    5 -----
 7 files changed, 7 insertions(+), 27 deletions(-)

New commits:
commit 1e3e2eb70a13a70bacaecb8a5e60c8c374924642
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 13 20:24:27 2015 +0000

    disentangle ENABLE_CAIRO_CANVAS from other cairo usage
    
    Change-Id: I135c14c90d791959f36dde5dc50687cc09f2a151

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 6c108a3..8edc059 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -33,9 +33,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basebmp/scanlineformats.hxx>
 
-#if ENABLE_CAIRO_CANVAS
 #include <cairo.h>
-#endif
 
 #if OSL_DEBUG_LEVEL > 2
 #include <basebmp/debug.hxx>
@@ -95,8 +93,6 @@ bool SvpSalGraphics::drawTransformedBitmap(
     return false;
 }
 
-#if ENABLE_CAIRO_CANVAS
-
 namespace
 {
     bool isCairoCompatible(const basebmp::BitmapDeviceSharedPtr &rBuffer)
@@ -134,13 +130,10 @@ void SvpSalGraphics::clipRegion(cairo_t* cr)
     }
 }
 
-#endif
-
 bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency)
 {
     bool bRet = false;
     (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
-#if ENABLE_CAIRO_CANVAS
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
     if (m_bUseLineColor || !m_bUseFillColor)
         return bRet;
@@ -195,7 +188,6 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
     }
     bRet = true;
 #endif
-#endif
     return bRet;
 }
 
@@ -878,14 +870,9 @@ SystemGraphicsData SvpSalGraphics::GetGraphicsData() const
 
 bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const
 {
-#if ENABLE_CAIRO_CANVAS
     return m_aDrawMode != basebmp::DrawMode::XOR &&
            OutDevSupport_TransparentRect == eType &&
            isCairoCompatible(m_aDevice);
-#else
-    (void)eType;
-    return false;
-#endif
 }
 
 #endif
commit be08685bed07f02c23c37f54c85c548945d5655c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 13 15:47:52 2015 +0000

    silence Solar-Version warnings
    
    Change-Id: I32bf78bcb44465bbe4c62e7ca144e801770ec53f

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 8c23aa3..b5627ee 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -217,7 +217,6 @@ bool JobSetup::operator==( const JobSetup& rJobSetup ) const
 
 SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
 {
-    SAL_WARN_IF( !rIStream.GetVersion(), "vcl", "JobSetup::>> - Solar-Version not set on rOStream" );
 
     {
         sal_uInt16 nLen = 0;
@@ -311,11 +310,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
 
 SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
 {
-    SAL_WARN_IF( !rOStream.GetVersion(), "vcl", "JobSetup::<< - Solar-Version not set on rOStream" );
 
-    // We do not have a new FileFormat at this point in time
-    // #define JOBSET_FILEFORMAT2      3780
-    // if ( rOStream.GetVersion() < JOBSET_FILEFORMAT2 )
     {
         sal_uInt16 nLen = 0;
         if ( !rJobSetup.mpData )
commit c7c2488f0a0839f8a01c46e9a55f5e7bcb39b5a2
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Fri Nov 13 12:53:52 2015 +0000

    Related: #i126649# Fix wrong at tag names
    
    (cherry picked from commit 902cd9fe198a4e24843b0e4432cbc2dd3c587056)
    
    Change-Id: I7cac635d9e7b6eae93466ced0349edc01caab0c2

diff --git a/offapi/com/sun/star/configuration/AccessRootElement.idl b/offapi/com/sun/star/configuration/AccessRootElement.idl
index 0d2e3e4..fd86ae4 100644
--- a/offapi/com/sun/star/configuration/AccessRootElement.idl
+++ b/offapi/com/sun/star/configuration/AccessRootElement.idl
@@ -123,8 +123,8 @@ published service AccessRootElement
  with a single event.
  </p>
 
- @ see UpdateRootElement
- @ see com::sun::star::util::XChangesBatch
+ @see UpdateRootElement
+ @see com::sun::star::util::XChangesBatch
 */
     interface com::sun::star::util::XChangesNotifier;
 
diff --git a/offapi/com/sun/star/configuration/SetElement.idl b/offapi/com/sun/star/configuration/SetElement.idl
index 009ae43..c250bfb 100644
--- a/offapi/com/sun/star/configuration/SetElement.idl
+++ b/offapi/com/sun/star/configuration/SetElement.idl
@@ -153,7 +153,7 @@ published service SetElement
  implementation.
  </p>
 
- @ see com::sun::star::configuration::XTemplateContainer
+ @see com::sun::star::configuration::XTemplateContainer
 */
     interface com::sun::star::configuration::XTemplateInstance;
 };
diff --git a/offapi/com/sun/star/configuration/UpdateRootElement.idl b/offapi/com/sun/star/configuration/UpdateRootElement.idl
index 3dc3057e..78342f7 100644
--- a/offapi/com/sun/star/configuration/UpdateRootElement.idl
+++ b/offapi/com/sun/star/configuration/UpdateRootElement.idl
@@ -82,8 +82,8 @@ published service UpdateRootElement
  is invoked.
  </p>
 
- @ see AccessRootElement
- @ see com::sun::star::util::XChangesNotifier
+ @see AccessRootElement
+ @see com::sun::star::util::XChangesNotifier
 */
     interface com::sun::star::util::XChangesBatch;
 };
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 2c46a5f..1851564 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -75,10 +75,8 @@ interface XPackageRegistry
         @param mediaType
                media type of package, empty string if to be detected
         @param removed
-
         @param identifier
                the identifier of the extension
-
         @param xCmdEnv
                command environment for error and progress handling
         @return
diff --git a/offapi/com/sun/star/table/TableSortField.idl b/offapi/com/sun/star/table/TableSortField.idl
index bf94533..fc6bab3 100644
--- a/offapi/com/sun/star/table/TableSortField.idl
+++ b/offapi/com/sun/star/table/TableSortField.idl
@@ -64,7 +64,7 @@ published struct TableSortField
         com::sun::star::table::TableSortFieldType::NUMERIC
         </p>
 
-        @ see   com::sun::star::i18n::XCollator
+        @see   com::sun::star::i18n::XCollator
      */
     com::sun::star::lang::Locale CollatorLocale;
 
@@ -74,7 +74,7 @@ published struct TableSortField
         com::sun::star::table::TableSortFieldType::NUMERIC
         </p>
 
-        @ see   com::sun::star::i18n::XCollator
+        @see   com::sun::star::i18n::XCollator
      */
     string CollatorAlgorithm;
 


More information about the Libreoffice-commits mailing list