[Libreoffice-commits] .: 3 commits - desktop/source l10ntools/source sdext/source

Mon Oct 3 06:56:55 PDT 2011

desktop/source/deployment/gui/dp_gui_extlistbox.cxx                     |    4 +++-
 l10ntools/source/localize.cxx                                           |    1 +
 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp |   10 +++++-----
 sdext/source/presenter/makefile.mk                                      |    2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit eabbfc9d141251dab698b2ca0ddef4d49b279cb6
Author: Andras Timar <atimar at suse.com>
Date:   Mon Oct 3 15:54:22 2011 +0200

    solve a cosmetic issue in Extension Manager window
    
    When the extension entry is not highlighted, replace LF to space
    in description text, so words do not stick together in one line view.

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 96e4e59..e72519d 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -592,7 +592,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
         aTextHeight = nIconHeight;
 
     // draw description
-    String sDescription;
+    ::rtl::OUString sDescription;
     if ( pEntry->m_sErrorText.Len() )
     {
         if ( pEntry->m_bActive )
@@ -616,6 +616,8 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     }
     else
     {
+        //replace LF to space, so words do not stick together in one line view
+        sDescription = sDescription.replace(0x000A, ' ');
         const long nWidth = GetTextWidth( sDescription );
         if ( nWidth > rRect.GetWidth() - aPos.X() )
             sDescription = GetEllipsisString( sDescription, rRect.GetWidth() - aPos.X() );
commit c056497ec513a788500cd782a29969acbea6a6be
Author: Andras Timar <atimar at suse.com>
Date:   Mon Oct 3 13:52:42 2011 +0200

    extract strings from scripting module

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 2ed64a8..8e0a370 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -146,6 +146,7 @@ const char *ModuleList[] = {
     "scaddins",
     "sccomp",
     "scp2",
+    "scripting",
     "sd",
     "sdext",
     "setup_native",
commit 691053ba8a954647563fb331a4aa45723ccff102
Author: Andras Timar <atimar at suse.com>
Date:   Mon Oct 3 13:41:48 2011 +0200

    eliminate @PRESENTEREXTENSIONPRODUCTNAME@ variable

diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
index ba8f29b..1c07357 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
@@ -33,16 +33,16 @@
 
 <meta>
       <topic id="textpresenterxml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</title>
+         <title xml-lang="en-US" id="tit" l10n="NEW">Presenter Console Keyboard Shortcuts</title>
          <filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
       </topic>
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="hid/com.sun.PresenterScreen" id="bm_id3138439" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>@PRESENTEREXTENSIONPRODUCTNAME@ shortcuts</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>Presenter Console shortcuts</bookmark_value>
 </bookmark>
-<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the @PRESENTEREXTENSIONPRODUCTNAME@, you can use the following keys:</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">Presenter Console Keyboard Shortcuts</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the Presenter Console, you can use the following keys:</paragraph>
       <table id="tbl_id0921200901051232">
          <tablerow>
             <tablecell>
@@ -158,7 +158,7 @@
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the @PRESENTEREXTENSIONPRODUCTNAME@</paragraph>
+               <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the Presenter Console</paragraph>
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id0921200901104544" role="tablecontent" l10n="NEW">Ctrl-'1'</paragraph>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 6427c25..1afbb1e 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -291,7 +291,7 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
 $(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
     @echo creating $@
     @-$(MKDIRHIER) $(@:d)
-    $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
+    $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" > $@
 
 .IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
