[Libreoffice-commits] core.git: 2 commits - sc/source starmath/source

[Stephan Bergmann]

 sc/source/ui/view/tabview.cxx    |   21 ---------------------
 starmath/source/mathmlexport.cxx |   24 ++++++------------------
 starmath/source/mathmlimport.cxx |   12 +++---------
 starmath/source/unodoc.cxx       |    4 +---
 starmath/source/unomodel.cxx     |    9 ++++-----
 5 files changed, 14 insertions(+), 56 deletions(-)

New commits:
commit e575e89b296f3f4356b1644730e574fe25bbcac8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 5 11:40:16 2015 +0100

    -Werror,-Wunused-function
    
    Change-Id: I46f438646c79421eafa894ee0803a3dd8c75c319

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 24ab8ec..7905ff4 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1941,27 +1941,6 @@ Point ScTabView::GetMousePosPixel()
     return aPos;
 }
 
-namespace
-{
-
-bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, vcl::Window* pWin )
-{
-    if (pWin)
-    {
-        //  SPLIT_HANDLE_SIZE draufaddieren, damit das Einrasten genau
-        //  auf dem Splitter nicht aussetzt
-
-        Point aRel = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel );
-        Size aWinSize = pWin->GetOutputSizePixel();
-        if ( aRel.X() >= 0 && aRel.X() < aWinSize.Width() + SPLIT_HANDLE_SIZE &&
-                aRel.Y() >= 0 && aRel.Y() < aWinSize.Height() + SPLIT_HANDLE_SIZE )
-            return true;
-    }
-    return false;
-}
-
-} // anonymous namespace
-
 void ScTabView::FreezeSplitters( bool bFreeze )
 {
     ScSplitMode eOldH = aViewData.GetHSplitMode();
commit 9dd8510e41dbdeb39598eed04e260525810141ce
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Mar 2 18:35:54 2015 +0900

    tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
    
    in starmath.
    
    Change-Id: I823b352b2b6bdc247bdb3ce875953430546a3be8
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 39614c2..e2a6340 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -401,9 +401,7 @@ OUString SAL_CALL SmXMLExport_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLExport_getSupportedServiceNames()
         throw()
 {
-    const OUString aServiceName( EXPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLExport_createInstance(
@@ -424,9 +422,7 @@ OUString SAL_CALL SmXMLExportMetaOOO_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLExportMetaOOO_getSupportedServiceNames()
     throw()
 {
-    const OUString aServiceName( EXPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMetaOOO_createInstance(
@@ -444,9 +440,7 @@ OUString SAL_CALL SmXMLExportMeta_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLExportMeta_getSupportedServiceNames()
 throw()
 {
-    const OUString aServiceName( EXPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMeta_createInstance(
@@ -464,9 +458,7 @@ OUString SAL_CALL SmXMLExportSettingsOOO_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLExportSettingsOOO_getSupportedServiceNames()
 throw()
 {
-    const OUString aServiceName( EXPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettingsOOO_createInstance(
@@ -484,9 +476,7 @@ OUString SAL_CALL SmXMLExportSettings_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLExportSettings_getSupportedServiceNames()
 throw()
 {
-    const OUString aServiceName( EXPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettings_createInstance(
@@ -504,9 +494,7 @@ OUString SAL_CALL SmXMLExportContent_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLExportContent_getSupportedServiceNames()
         throw()
 {
-    const OUString aServiceName( EXPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLExportContent_createInstance(
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index f2bd15d..45cb027 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -431,9 +431,7 @@ OUString SAL_CALL SmXMLImport_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLImport_getSupportedServiceNames()
         throw()
 {
-    const OUString aServiceName( IMPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-        return aSeq;
+    return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance(
@@ -453,9 +451,7 @@ OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLImportMeta_getSupportedServiceNames()
 throw()
 {
-    const OUString aServiceName( IMPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
+    return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLImportMeta_createInstance(
@@ -475,9 +471,7 @@ OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw()
 uno::Sequence< OUString > SAL_CALL SmXMLImportSettings_getSupportedServiceNames()
         throw()
 {
-    const OUString aServiceName( IMPORT_SVC_NAME );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-        return aSeq;
+    return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance(
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 225fa29..1d89f4a 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -36,9 +36,7 @@ OUString SAL_CALL SmDocument_getImplementationName() throw()
 
 uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw()
 {
-    uno::Sequence< OUString > aSeq( 1 );
-    aSeq[0] = "com.sun.star.formula.FormulaProperties";
-    return aSeq;
+    return uno::Sequence<OUString>{ "com.sun.star.formula.FormulaProperties" };
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance(
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 02d8864..d45f732 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -422,11 +422,10 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames_Static(void)
 {
     SolarMutexGuard aGuard;
 
-    uno::Sequence< OUString > aRet(2);
-    OUString* pArray = aRet.getArray();
-    pArray[0] = "com.sun.star.document.OfficeDocument";
-    pArray[1] = "com.sun.star.formula.FormulaProperties";
-    return aRet;
+    return uno::Sequence<OUString>{
+        "com.sun.star.document.OfficeDocument",
+        "com.sun.star.formula.FormulaProperties"
+    };
 }
 
 void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues)