[Libreoffice-commits] core.git: dbaccess/source uui/source writerfilter/source

Noel Grandin noel.grandin at collabora.co.uk
Wed Apr 4 08:35:27 UTC 2018


 dbaccess/source/ui/inc/sqlmessage.hxx       |    4 +---
 uui/source/logindlg.hxx                     |    3 +--
 writerfilter/source/dmapper/PropertyMap.cxx |    2 --
 writerfilter/source/dmapper/PropertyMap.hxx |    3 +--
 4 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit f4bcba6074f394cc0ce3b660308b3ee8e4714978
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Apr 3 10:41:22 2018 +0200

    loplugin:unusedenumconstants
    
    Change-Id: I6069ca8874329e7f15903aa8ef51000c9c280d47
    Reviewed-on: https://gerrit.libreoffice.org/52200
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index 0f8bbe49142a..2aaa4bd5a18e 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -58,14 +58,12 @@ enum class MessBoxStyle {
     DefaultRetry      = 0x0080,
     DefaultYes        = 0x0100,
     DefaultNo         = 0x0200,
-    AbortRetryIgnore  = 0x1000,
-    DefaultIgnore     = 0x2000,
 };
 
 }
 
 namespace o3tl {
-    template<> struct typed_flags<dbaui::MessBoxStyle> : is_typed_flags<dbaui::MessBoxStyle, 0x3fff> {};
+    template<> struct typed_flags<dbaui::MessBoxStyle> : is_typed_flags<dbaui::MessBoxStyle, 0x0fff> {};
 }
 
 
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 85b2ef3f1f99..f2228944d79c 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -33,13 +33,12 @@ enum class LoginFlags {
     NoPassword          = 0x0004,  // hide "password"
     NoSavePassword      = 0x0008,  // hide "save password"
     NoErrorText         = 0x0010,  // hide message
-    PathReadonly        = 0x0020,  // "path" readonly
     UsernameReadonly    = 0x0040,  // "name" readonly
     NoAccount           = 0x0080,  // hide "account"
     NoUseSysCreds       = 0x0100,  // hide "use system credentials"
 };
 namespace o3tl {
-    template<> struct typed_flags<LoginFlags> : is_typed_flags<LoginFlags, 0x01fe> {};
+    template<> struct typed_flags<LoginFlags> : is_typed_flags<LoginFlags, 0x01de> {};
 }
 
 
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index bf3522008f63..c1d16437cfa3 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -563,8 +563,6 @@ void SectionPropertyMap::ApplyBorderToPageStyles( const uno::Reference< containe
             if ( !m_sFollowPageStyleName.isEmpty() )
                 xFirst = GetPageStyle( xPageStyles, xTextFactory, false );
             break;
-        case BorderApply::ToWholeDocument: // whole document?
-                // todo: how to apply a border to the whole document - find all sections or access all page styles?
         default:
             return;
     }
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 07e1707a8a5a..91962a7b0adb 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -186,8 +186,7 @@ public:
     {
         ToAllInSection = 0,
         ToFirstPageInSection = 1,
-        ToAllButFirstInSection = 2,
-        ToWholeDocument = 3,
+        ToAllButFirstInSection = 2
     };
     enum class BorderOffsetFrom
     {


More information about the Libreoffice-commits mailing list