[Libreoffice-commits] core.git: 2 commits - hwpfilter/source sd/source

[Stephan Bergmann]

 hwpfilter/source/hwpreader.cxx          |   29 +++++++++++++++++++++++++----
 sd/source/ui/tools/EventMultiplexer.cxx |    2 --
 2 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit f42d03f3e9393db693ed753837ce25e1f43297df
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 24 13:00:39 2015 +0100

    Replace non-ASCII content in ordinary string literals with UTF-8 bytes
    
    Change-Id: Ib92221527550beb35e2263b150a509b3ef68545f

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 555c802..d5732f5 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -2724,7 +2724,12 @@ void HwpReader::make_text_p0(HWPPara * para, bool bParaStart)
     }
     if( d->bFirstPara && d->bInBody )
     {
-        strcpy(buf,"[문서의 처음]"); /* "Begin of Document" */
+        strcpy(
+            buf,
+            "[\xEB\xAC\xB8\xEC\x84\x9C\xEC\x9D\x98 \xEC\xB2\x98\xEC\x9D\x8C]");
+            // U+BB38 HANGUL SYLLABLE MUN, U+C11C HANGUL SYLLABLE SEO,
+            // U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
+            // U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
         padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
         rstartEl("text:bookmark", rList);
         pList->clear();
@@ -2795,7 +2800,12 @@ void HwpReader::make_text_p1(HWPPara * para,bool bParaStart)
     if( d->bFirstPara && d->bInBody )
     {
 /* for HWP's Bookmark */
-        strcpy(buf,"[문서의 처음]"); /* "Begin of Document" */
+        strcpy(
+            buf,
+            "[\xEB\xAC\xB8\xEC\x84\x9C\xEC\x9D\x98 \xEC\xB2\x98\xEC\x9D\x8C]");
+            // U+BB38 HANGUL SYLLABLE MUN, U+C11C HANGUL SYLLABLE SEO,
+            // U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
+            // U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
         padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
         rstartEl("text:bookmark", rList);
         pList->clear();
@@ -2874,7 +2884,12 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart)
         if ( !pstart ) {
             STARTP;
         }
-        strcpy(buf,"[문서의 처음]"); /* "Begin of Document" */
+        strcpy(
+            buf,
+            "[\xEB\xAC\xB8\xEC\x84\x9C\xEC\x9D\x98 \xEC\xB2\x98\xEC\x9D\x8C]");
+            // U+BB38 HANGUL SYLLABLE MUN, U+C11C HANGUL SYLLABLE SEO,
+            // U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
+            // U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
         padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
         rstartEl("text:bookmark", rList);
         pList->clear();
@@ -4788,7 +4803,13 @@ void HwpReader::parsePara(HWPPara * para, bool bParaStart)
             if( d->bFirstPara && d->bInBody )
             {
 /* for HWP's Bookmark */
-                strcpy(buf,"[문서의 처음]"); /* "Begin of Document" */
+                strcpy(
+                    buf,
+                    "[\xEB\xAC\xB8\xEC\x84\x9C\xEC\x9D\x98"
+                        " \xEC\xB2\x98\xEC\x9D\x8C]");
+                    // U+BB38 HANGUL SYLLABLE MUN, U+C11C HANGUL SYLLABLE SEO,
+                    // U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
+                    // U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
                 padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
                 rstartEl("text:bookmark", rList);
                 pList->clear();
commit 5468446041f3d3e7da25c888bb33565ef9ad203f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 24 11:51:21 2015 +0100

    -Werror,-Wunused-private-field
    
    Change-Id: I592db0524cb1d028e7dd3c3d49457f4a4038d5be

diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index ff73e27..7a505ee 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -129,7 +129,6 @@ private:
 
     css::uno::WeakReference<css::frame::XController> mxControllerWeak;
     css::uno::WeakReference<css::frame::XFrame> mxFrameWeak;
-    css::uno::WeakReference<css::view::XSelectionSupplier> mxSlideSorterSelectionWeak;
     SdDrawDocument* mpDocument;
     css::uno::WeakReference<css::drawing::framework::XConfigurationController>
          mxConfigurationControllerWeak;
@@ -210,7 +209,6 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase)
       mbListeningToFrame (false),
       mxControllerWeak(nullptr),
       mxFrameWeak(nullptr),
-      mxSlideSorterSelectionWeak(nullptr),
       mpDocument(nullptr),
       mxConfigurationControllerWeak()
 {