[ABANDONED] Add Dutch OpenTaal Thesaurus
Joren De Cuyper has abandoned this change. Change subject: Add Dutch OpenTaal Thesaurus .. Patch Set 1: Abandoned Thanks Timar! Back to the sketchboard :-) -- To view, visit https://gerrit.libreoffice.org/4121 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I0b063b59e4d8b1b91fed30ded83710070bf09bf0 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Add Dutch OpenTaal Thesaurus
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4121 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/21/4121/1 Add Dutch OpenTaal Thesaurus Change-Id: I0b063b59e4d8b1b91fed30ded83710070bf09bf0 --- A nl_NL/README_th_nl.txt M nl_NL/dictionaries.xcu A nl_NL/th_nl_v2.dat A nl_NL/th_nl_v2.idx 4 files changed, 421,801 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/4121 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b063b59e4d8b1b91fed30ded83710070bf09bf0 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Typo in optsecuritypage.ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4056 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/4056/1 Typo in optsecuritypage.ui Thanks to Lionel. Change-Id: Ib37c3cf9d8f53e941fc557dc9d4a4ba9b00e486d --- M cui/uiconfig/ui/optsecuritypage.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index 519ab25..bc53814 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -139,7 +139,7 @@ property name=row_spacing6/property child object class=GtkCheckButton id=usemasterpassword -property name=label translatable=yesProtected _by a master passwords (recommended)/property +property name=label translatable=yesProtected _by a master password (recommended)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -- To view, visit https://gerrit.libreoffice.org/4056 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib37c3cf9d8f53e941fc557dc9d4a4ba9b00e486d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] Typo in optsecuritypage.ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4057 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/4057/1 Typo in optsecuritypage.ui Thanks to Lionel. Change-Id: Ib37c3cf9d8f53e941fc557dc9d4a4ba9b00e486d --- M cui/uiconfig/ui/optsecuritypage.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index 519ab25..bc53814 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -139,7 +139,7 @@ property name=row_spacing6/property child object class=GtkCheckButton id=usemasterpassword -property name=label translatable=yesProtected _by a master passwords (recommended)/property +property name=label translatable=yesProtected _by a master password (recommended)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -- To view, visit https://gerrit.libreoffice.org/4057 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib37c3cf9d8f53e941fc557dc9d4a4ba9b00e486d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Delete double whitespace in optsecuritypage.ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4040 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/4040/1 Delete double whitespace in optsecuritypage.ui Found this double whitespace during translations. So lets fix it right away. Change-Id: Ifecfc15b5d0aead34b09df4cfb2c5a2c17c6b633 --- M cui/uiconfig/ui/optsecuritypage.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index 32acdd2..519ab25 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -139,7 +139,7 @@ property name=row_spacing6/property child object class=GtkCheckButton id=usemasterpassword -property name=label translatable=yesProtected _by a master passwords (recommended)/property +property name=label translatable=yesProtected _by a master passwords (recommended)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -- To view, visit https://gerrit.libreoffice.org/4040 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifecfc15b5d0aead34b09df4cfb2c5a2c17c6b633 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] Delete double whitespace in optsecuritypage.ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4041 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/4041/1 Delete double whitespace in optsecuritypage.ui Found this double whitespace during translations. So lets fix it right away. Change-Id: Ifecfc15b5d0aead34b09df4cfb2c5a2c17c6b633 --- M cui/uiconfig/ui/optsecuritypage.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index 32acdd2..519ab25 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -139,7 +139,7 @@ property name=row_spacing6/property child object class=GtkCheckButton id=usemasterpassword -property name=label translatable=yesProtected _by a master passwords (recommended)/property +property name=label translatable=yesProtected _by a master passwords (recommended)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -- To view, visit https://gerrit.libreoffice.org/4041 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifecfc15b5d0aead34b09df4cfb2c5a2c17c6b633 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#64870 Duplicate shortcut on Text Import dialogue
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4004 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/4004/1 fdo#64870 Duplicate shortcut on Text Import dialogue Accelerator 'o' is used for Open as well as Other, 'r' isn't used as accelerator in that dialog. Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6 --- M sc/uiconfig/scalc/ui/textimportcsv.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui index afe12d5..92012ad 100644 --- a/sc/uiconfig/scalc/ui/textimportcsv.ui +++ b/sc/uiconfig/scalc/ui/textimportcsv.ui @@ -390,7 +390,7 @@ property name=column_spacing12/property child object class=GtkCheckButton id=other -property name=label translatable=yes_Other/property +property name=label translatable=yesOthe_r/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -- To view, visit https://gerrit.libreoffice.org/4004 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64870 Duplicate shortcut on Text Import dialogue
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4006 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/4006/1 fdo#64870 Duplicate shortcut on Text Import dialogue Accelerator 'o' is used for Open as well as Other, 'r' isn't used as accelerator in that dialog. Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6 --- M sc/uiconfig/scalc/ui/textimportcsv.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui index afe12d5..92012ad 100644 --- a/sc/uiconfig/scalc/ui/textimportcsv.ui +++ b/sc/uiconfig/scalc/ui/textimportcsv.ui @@ -390,7 +390,7 @@ property name=column_spacing12/property child object class=GtkCheckButton id=other -property name=label translatable=yes_Other/property +property name=label translatable=yesOthe_r/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -- To view, visit https://gerrit.libreoffice.org/4006 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] fdo#64870 Duplicate shortcut on Text Import dialogue
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4005 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/4005/1 fdo#64870 Duplicate shortcut on Text Import dialogue Accelerator 'o' is used for Open as well as Other, 'r' isn't used as accelerator in that dialog. Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6 --- M sc/uiconfig/scalc/ui/textimportcsv.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui index afe12d5..92012ad 100644 --- a/sc/uiconfig/scalc/ui/textimportcsv.ui +++ b/sc/uiconfig/scalc/ui/textimportcsv.ui @@ -390,7 +390,7 @@ property name=column_spacing12/property child object class=GtkCheckButton id=other -property name=label translatable=yes_Other/property +property name=label translatable=yesOthe_r/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -- To view, visit https://gerrit.libreoffice.org/4005 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62483 missing default button in format - aligment dialo...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3994
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/3994/1
fdo#62483 missing default button in format - aligment dialog at math
The default button was missing because the dialog was to small (it fell off).
Also the default button was placed a bit to far from the help button IMHO.
Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181
---
M starmath/source/smres.src
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index dc4ee7b..ec96e52 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -875,7 +875,7 @@
OutputSize = TRUE ;
SVLook = TRUE ;
HelpId = CMD_SID_ALIGN ;
-Size = MAP_APPFONT ( 139 , 66 ) ;
+Size = MAP_APPFONT ( 139 , 80 ) ;
Text [ en-US ] = Alignment ;
RadioButton 1
{
@@ -932,7 +932,7 @@
{
HelpID = starmath:PushButton:RID_ALIGNDIALOG:1;
TabStop = TRUE ;
-Pos = MAP_APPFONT ( 83 , 69 ) ;
+Pos = MAP_APPFONT ( 83 , 63 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = ~Default ;
};
--
To view, visit https://gerrit.libreoffice.org/3994
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#62483 missing default button in format - aligment dialo...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3995
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/3995/1
fdo#62483 missing default button in format - aligment dialog at math
The default button was missing because the dialog was to small (it fell off).
Also the default button was placed a bit to far from the help button IMHO.
Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181
---
M starmath/source/smres.src
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index dc4ee7b..ec96e52 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -875,7 +875,7 @@
OutputSize = TRUE ;
SVLook = TRUE ;
HelpId = CMD_SID_ALIGN ;
-Size = MAP_APPFONT ( 139 , 66 ) ;
+Size = MAP_APPFONT ( 139 , 80 ) ;
Text [ en-US ] = Alignment ;
RadioButton 1
{
@@ -932,7 +932,7 @@
{
HelpID = starmath:PushButton:RID_ALIGNDIALOG:1;
TabStop = TRUE ;
-Pos = MAP_APPFONT ( 83 , 69 ) ;
+Pos = MAP_APPFONT ( 83 , 63 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = ~Default ;
};
--
To view, visit https://gerrit.libreoffice.org/3995
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] fdo#62483 missing default button in format - aligment dialo...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3996
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/3996/1
fdo#62483 missing default button in format - aligment dialog at math
The default button was missing because the dialog was to small (it fell off).
Also the default button was placed a bit to far from the help button IMHO.
Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181
Reviewed-on: https://gerrit.libreoffice.org/3995
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
---
M starmath/source/smres.src
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index dc4ee7b..ec96e52 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -875,7 +875,7 @@
OutputSize = TRUE ;
SVLook = TRUE ;
HelpId = CMD_SID_ALIGN ;
-Size = MAP_APPFONT ( 139 , 66 ) ;
+Size = MAP_APPFONT ( 139 , 80 ) ;
Text [ en-US ] = Alignment ;
RadioButton 1
{
@@ -932,7 +932,7 @@
{
HelpID = starmath:PushButton:RID_ALIGNDIALOG:1;
TabStop = TRUE ;
-Pos = MAP_APPFONT ( 83 , 69 ) ;
+Pos = MAP_APPFONT ( 83 , 63 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = ~Default ;
};
--
To view, visit https://gerrit.libreoffice.org/3996
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#32368 - Link both Ctrl+Y as Ctrl+Shift+Z as shortcut key...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3853 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/3853/1 fdo#32368 - Link both Ctrl+Y as Ctrl+Shift+Z as shortcut keys for Redo As discussed on the UX-advice and bug report itself, we agreed to link both shortcut keys to the redo command. Due http://opengrok.libreoffice.org/xref/core/framework/source/inc/accelerators/acceleratorcache.hxx#75 : /*map commands to keys in relation 1:n. First key is interpreted as preferred one!*/ the shortcut key that is mentioned in the menu entry is ctrl+y (or cmd+y for Mac users). UX-advice thread: http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-May/002033.html Change-Id: I8d766b300d79e9ebd85dc5ae7bb327cf9c1a7c41 --- M officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 1 file changed, 86 insertions(+), 80 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index d2d7069..2ef7c67 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -190,7 +190,13 @@ value xml:lang=en-US.uno:Repeat/value /prop /node - node oor:name=Y_MOD1 oor:op=replace install:module=unxwnt + node oor:name=Z_SHIFT_MOD1 oor:op=replace +prop oor:name=Command + value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value + value xml:lang=en-US.uno:Redo/value +/prop + /node + node oor:name=Y_MOD1 oor:op=fuse prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Redo/value @@ -200,12 +206,6 @@ prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Undo/value -/prop - /node - node oor:name=Z_SHIFT_MOD1 oor:op=replace install:module=macosx -prop oor:name=Command - value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value - value xml:lang=en-US.uno:Redo/value /prop /node /node @@ -1132,7 +1132,13 @@ value xml:lang=en-US.uno:PasteSpecial/value /prop /node -node oor:name=Y_MOD1 oor:op=replace install:module=unxwnt +node oor:name=Z_SHIFT_MOD1 oor:op=replace + prop oor:name=Command +value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value +value xml:lang=en-US.uno:Redo/value + /prop +/node +node oor:name=Y_MOD1 oor:op=fuse prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Redo/value @@ -1142,12 +1148,6 @@ prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Undo/value - /prop -/node -node oor:name=Z_SHIFT_MOD1 oor:op=replace install:module=macosx - prop oor:name=Command -value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:Redo/value /prop /node node oor:name=C_MOD1_MOD2 oor:op=replace @@ -1248,7 +1248,13 @@ value xml:lang=en-US.uno:Cut/value /prop /node -node oor:name=Y_MOD1 oor:op=replace install:module=unxwnt +node oor:name=Z_SHIFT_MOD1 oor:op=replace + prop oor:name=Command +value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value +value xml:lang=en-US.uno:Redo/value + /prop +/node +node oor:name=Y_MOD1 oor:op=fuse prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Redo/value @@ -1258,12 +1264,6 @@ prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Undo/value - /prop -/node -node oor:name=Z_SHIFT_MOD1 oor:op=replace install:module=macosx - prop oor:name=Command -value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:Redo/value /prop /node /node @@ -1668,7 +1668,13 @@ value xml:lang=en-US.uno:Cut/value /prop /node -node oor:name=Y_MOD1 oor:op=replace install:module=unxwnt +node oor:name=Z_SHIFT_MOD1 oor:op=replace + prop oor:name=Command +value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value +value xml:lang=en-US.uno:Redo/value + /prop +/node +node
[PATCH] fdo#30715 Several commands are under the wrong category
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3854 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/3854/1 fdo#30715 Several commands are under the wrong category Placing insert commands under category insert is more logical Change-Id: Ib322aaace39cd160cc81ef4945abd2047e6c4c12 --- M sc/sdi/scalc.sdi 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 2780301..d53a29d 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -8265,7 +8265,7 @@ MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] SfxVoidItem InsertFieldDocTitle SID_INSERT_FIELD_TITLE @@ -8289,7 +8289,7 @@ MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] SfxVoidItem InsertFieldDateVariable SID_INSERT_FIELD_DATE_VAR @@ -8313,7 +8313,7 @@ MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] -- To view, visit https://gerrit.libreoffice.org/3854 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib322aaace39cd160cc81ef4945abd2047e6c4c12 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Solve fdo#64406 Missing right closing parenthesis
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3837 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/3837/1 Solve fdo#64406 Missing right closing parenthesis Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573 --- M wizards/source/tools/Strings.xba 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba index 5ff7ca2..f91b8f4 100644 --- a/wizards/source/tools/Strings.xba +++ b/wizards/source/tools/Strings.xba @@ -26,7 +26,7 @@ Function ElimChar(ByVal BigString as String, ElimArray() as String) Dim i% ,n% For i = 0 to Ubound(ElimArray) - BigString = DeleteStr(BigString,ElimArray(i) + BigString = DeleteStr(BigString,ElimArray(i)) Next ElimChar = BigString End Function @@ -466,4 +466,4 @@ End If NOERR: End Function -/script:module \ No newline at end of file +/script:module -- To view, visit https://gerrit.libreoffice.org/3837 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Solve fdo#64359 Duplicate template in list when overwriting ...
Joren De Cuyper has abandoned this change. Change subject: Solve fdo#64359 Duplicate template in list when overwriting existing template .. Patch Set 1: Abandoned wrong way to fix this (thanks to Rafael' review) -- To view, visit https://gerrit.libreoffice.org/3825 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Iebe301216f3131db72ff97d2b81003eefc0b0dbf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Rafael Dominguez venccsra...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Solve fdo#64406 Missing right closing parenthesis
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3840 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3840/1 Solve fdo#64406 Missing right closing parenthesis Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573 Reviewed-on: https://gerrit.libreoffice.org/3837 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com --- M wizards/source/tools/Strings.xba 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba index 5ff7ca2..f91b8f4 100644 --- a/wizards/source/tools/Strings.xba +++ b/wizards/source/tools/Strings.xba @@ -26,7 +26,7 @@ Function ElimChar(ByVal BigString as String, ElimArray() as String) Dim i% ,n% For i = 0 to Ubound(ElimArray) - BigString = DeleteStr(BigString,ElimArray(i) + BigString = DeleteStr(BigString,ElimArray(i)) Next ElimChar = BigString End Function @@ -466,4 +466,4 @@ End If NOERR: End Function -/script:module \ No newline at end of file +/script:module -- To view, visit https://gerrit.libreoffice.org/3840 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] resolve fdo#64446 Repeat shortcut isn't showed correctly in ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3850 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3850/1 resolve fdo#64446 Repeat shortcut isn't showed correctly in menu entry Change-Id: I991185f6b4efd305dc55c9ad85f9f706f8a0 --- M officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index d2d7069..8e5a3da 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -961,7 +961,7 @@ value xml:lang=en-US.uno:ToggleFormula/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -1218,7 +1218,7 @@ value xml:lang=en-US.uno:Quit/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -1592,7 +1592,7 @@ value xml:lang=en-US.uno:Quit/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -2288,7 +2288,7 @@ value xml:lang=en-US.uno:SuperScript/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -2839,7 +2839,7 @@ value xml:lang=en-US.uno:Quit/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -3609,7 +3609,7 @@ value xml:lang=en-US.uno:SuperScript/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -4388,7 +4388,7 @@ value xml:lang=en-US.uno:SuperScript/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -5131,7 +5131,7 @@ value xml:lang=en-US.uno:SuperScript/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -5904,7 +5904,7 @@ value xml:lang=en-US.uno:SuperScript/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value @@ -6677,7 +6677,7 @@ value xml:lang=en-US.uno:SuperScript/value /prop /node -node oor:name=REPEAT oor:op=replace +node oor:name=Y_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value value xml:lang=en-US.uno:Repeat/value -- To view, visit https://gerrit.libreoffice.org/3850 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I991185f6b4efd305dc55c9ad85f9f706f8a0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Solve fdo#64359 Duplicate template in list when overwriting ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3825
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3825/1
Solve fdo#64359 Duplicate template in list when overwriting existing template
This patch just ensures an updates/refreshed view when a duplicate template
is saved.
Change-Id: Iebe301216f3131db72ff97d2b81003eefc0b0dbf
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b7c4582..b06c706 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1056,11 +1056,10 @@
OUString aTemplateList;
INetURLObject aPathObj(xFolderPicker-getDirectory());
aPathObj.setFinalSlash();
+sal_uInt16 i = 1;
if (mpSearchView-IsVisible())
{
-sal_uInt16 i = 1;
-
std::setconst
ThumbnailViewItem*,selection_cmp_fn::const_iterator pIter =
maSelTemplates.begin();
for (pIter = maSelTemplates.begin(); pIter !=
maSelTemplates.end(); ++pIter, ++i)
{
@@ -1090,7 +1089,6 @@
{
// export templates from the current view
-sal_uInt16 i = 1;
sal_uInt16 nRegionItemId = maView-getCurRegionItemId();
std::setconst
ThumbnailViewItem*,selection_cmp_fn::const_iterator pIter =
maSelTemplates.begin();
@@ -1400,6 +1398,9 @@
if (!aFolderList.isEmpty())
{
}
+
+//refresh view
+mpCurView-reload();
}
}
}
--
To view, visit https://gerrit.libreoffice.org/3825
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebe301216f3131db72ff97d2b81003eefc0b0dbf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Partially translate german comments in sw/source/filter/ww8/
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3788
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3788/1
Partially translate german comments in sw/source/filter/ww8/
Please, only apply this patch if you are a native speaking German.
I'm not a native speaker, so a double check is really necessary and appreciated.
Thanks in advance!
Change-Id: I9493d128e124d319391aa851ae364aefeb27c512
---
M sw/source/filter/ww8/ww8scan.cxx
1 file changed, 181 insertions(+), 217 deletions(-)
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 7894120..eb649b0 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -112,7 +112,7 @@
// WW7- Sprms
static const SprmInfo aSprms[] =
{
-{ 0, 0, L_FIX}, // Default-sprm, wird uebersprungen
+{ 0, 0, L_FIX}, // Default-sprm, will be skipped
{ 2, 1, L_FIX}, // sprmPIstd, pap.istd (style code)
{ 3, 0, L_VAR}, // sprmPIstdPermute pap.istd permutation
{ 4, 1, L_FIX}, // sprmPIncLv1 pap.istddifference
@@ -939,13 +939,10 @@
return 0; // SPRM _not_ found
}
-//-
-// temporaerer Test
-//-
-// WW8PLCFx_PCDAttrs halten sich an WW8PLCF_Pcd fest und besitzen deshalb keine
-// eigenen Iteratoren. Alle sich auf Iteratoren beziehenden Methoden
-// sind deshalb Dummies.
-
+// temporary test
+// WW8PLCFx_PCDAttrs cling to WW8PLCF_Pcd and therefore do not have their own
iterators.
+// All relating to iterators methods are therefore dummies.
+// All iterators related to methods are consequently dummies.
WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion,
WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase)
: WW8PLCFx(eVersion, true), pPcdI(pPLCFx_PCD-GetPLCFIter()),
@@ -1013,16 +1010,16 @@
}
else
{
-// PRM Variante 1: Sprm wird direkt in Member-Var abgelegt
+// SPRM is deposited directly into members-Var
/*
-Dies sind die Attr, die in der Piece-Table stehen, statt im Text !
+These are the attr that are in the piece-table, instead of in the
text!
*/
if (IsSevenMinus(GetFIBVersion()))
{
aShortSprm[0] = (sal_uInt8)( ( nPrm 0xfe) 1 );
aShortSprm[1] = (sal_uInt8)( nPrm 8 );
-p-nSprmsLen = ( nPrm ) ? 2 : 0;// Laenge
+p-nSprmsLen = ( nPrm ) ? 2 : 0;// length
// store Postion of internal mini storage in Data Pointer
p-pMemPos = aShortSprm;
@@ -1034,7 +1031,7 @@
sal_uInt8 nSprmListIdx = (sal_uInt8)((nPrm 0xfe) 1);
if( nSprmListIdx )
{
-// process Sprm Id Matching as explained in MS Doku
+// process Sprm Id Matching as explained in MS Documentation
//
// ''Property Modifier(variant 1) (PRM)''
// see file: s62f39.htm
@@ -1132,13 +1129,11 @@
}
}
-//
-
WW8PLCFx_PCD::WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
WW8_CP nStartCp, bool bVer67P)
: WW8PLCFx(eVersion, false), nClipStart(-1)
{
-// eigenen Iterator konstruieren
+// construct own iterator
pPcdI = new WW8PLCFpcd_Iter(*pPLCFpcd, nStartCp);
bVer67= bVer67P;
}
@@ -1190,7 +1185,7 @@
void WW8PLCFx_PCD::advance()
{
-OSL_ENSURE(pPcdI , pPcdI fehlt);
+OSL_ENSURE(pPcdI , missing pPcdI);
if (pPcdI)
pPcdI-advance();
}
@@ -1240,7 +1235,7 @@
void* pData;
if ( !pPcdI-Get( nCpStart, nCpEnd, pData ) )
{
-OSL_ENSURE( !this, AktPieceStartFc2Cp() - Fehler );
+OSL_ENSURE( !this, AktPieceStartFc2Cp() - error );
return WW8_CP_MAX;
}
bool bIsUnicode = false;
@@ -1259,10 +1254,7 @@
return nCpStart + (nStartPos - nFcStart) / nUnicodeFactor;
}
-//-
-// Hilfsroutinen fuer alle
-//-
-
+// Helper routines for all
short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace,
sal_uInt8 *pCol, short *pIdx) const
{
@@ -1387,8 +1379,8 @@
WW8_CP nCpStart, nCpEnd;
void* pData;
if( !pPieceIter-Get( nCpStart, nCpEnd, pData ) )
-{ // ausserhalb PLCFfpcd ?
-OSL_ENSURE( !this, PLCFpcd-WW8Fc2Cp() ging schief );
+{ // outside PLCFfpcd ?
+OSL_ENSURE( !this, PLCFpcd-WW8Fc2Cp() went wrong );
break;
}
sal_Int32 nFcStart = SVBT32ToUInt32( ((WW8_PCD*)pData)-fc );
@@ -1472,7 +1464,7 @@
if( pTestFlag )
*pTestFlag = false;
else {
-
[PATCH] fdo#31082 cursor visible during impress presentation
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3376 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3376/1 fdo#31082 cursor visible during impress presentation Change-Id: I8983676244d0b996c237cbfc487ed68a535803d1 --- M vcl/aqua/source/window/salframe.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 608e9d8..cb31f56 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -931,6 +931,7 @@ case POINTER_WINDOW_WSIZE: pCursor = [NSCursor resizeLeftRightCursor]; break; case POINTER_REFHAND: pCursor = [NSCursor pointingHandCursor];break; +case POINTER_NULL: [NSCursor hide];break; default: pCursor = GetSalData()-getCursor( mePointerStyle ); -- To view, visit https://gerrit.libreoffice.org/3376 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8983676244d0b996c237cbfc487ed68a535803d1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63290 - UI: Goal Seek - incorrect term current cell
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3338
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3338/1
fdo#63290 - UI: Goal Seek - incorrect term current cell
Previous patch was a review patch I submitted to send to the UX advice
mailinglist. Cor proposed a better wording for the label name,
see https://bugs.freedesktop.org/show_bug.cgi?id=63290#c4
Therefore I correct my previous patch, that is already submitted.
Change-Id: I0cd1fac43ba3fed55fbb16e4f9bbf6836c1436b2
---
M sc/source/ui/src/globstr.src
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 2973240..cb364ed 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -451,7 +451,7 @@
};
String STR_MSSG_SOLVE_2
{
-Text [ en-US ] = ). Apply setting to spreadsheet? ;
+Text [ en-US ] = ). Apply to spreadsheet? ;
};
String STR_MSSG_SOLVE_3
{
--
To view, visit https://gerrit.libreoffice.org/3338
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cd1fac43ba3fed55fbb16e4f9bbf6836c1436b2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63290 UI: Goal Seek - incorrect term current cell
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3291
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3291/1
fdo#63290 UI: Goal Seek - incorrect term current cell
Change-Id: I0542d9918d9dbbfdc002b7fadec1bb461cbd2831
---
M sc/source/ui/src/globstr.src
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 06d1170..d042e38 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -447,11 +447,11 @@
};
String STR_MSSG_SOLVE_1
{
-Text [ en-US ] = Insert result ( ;
+Text [ en-US ] = Result ( ;
};
String STR_MSSG_SOLVE_2
{
-Text [ en-US ] = ) into current cell? ;
+Text [ en-US ] = ). Apply setting to spreadsheet? ;
};
String STR_MSSG_SOLVE_3
{
--
To view, visit https://gerrit.libreoffice.org/3291
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0542d9918d9dbbfdc002b7fadec1bb461cbd2831
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Convert starmath/ fontdialog to .ui
Joren De Cuyper has abandoned this change. Change subject: Convert starmath/ fontdialog to .ui .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/3181 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I745373e583d71819de34671f2e4f3a39871b6b9a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Olivier Hallot olivier.hal...@edx.srv.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#51615 replace button in FindReplace Dialog not search f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3197
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3197/1
fdo#51615 replace button in FindReplace Dialog not search for the next item
Change-Id: Ia1735ae39618fb8b0e4749e1970adfe83192f755
---
M sc/source/ui/view/viewfun2.cxx
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 22a25ec..6bc810f 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1769,7 +1769,13 @@
|| nCommand == SVX_SEARCHCMD_REPLACE_ALL )
{
if ( nCommand == SVX_SEARCHCMD_REPLACE )
+{
pDocSh-PostPaint( nCol,nRow,nTab, nCol,nRow,nTab, PAINT_GRID
);
+SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
+aSearchItem.SetCommand(SVX_SEARCHCMD_FIND);
+aSearchItem.SetWhich(SID_SEARCH_ITEM);
+GetViewData()-GetDispatcher().Execute( FID_SEARCH_NOW,
SFX_CALLMODE_STANDARD, aSearchItem, 0L );
+}
else
pDocSh-PostPaintGridAll();
pDocSh-SetDocumentModified();
--
To view, visit https://gerrit.libreoffice.org/3197
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1735ae39618fb8b0e4749e1970adfe83192f755
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Convert starmath/ fontdialog to .ui
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3181
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3181/1
Convert starmath/ fontdialog to .ui
Status: Draft
!Please do not submit yet!
Reason: Some questions/problems
Thanks in advance
Joren
Change-Id: I745373e583d71819de34671f2e4f3a39871b6b9a
---
M starmath/UI_smath.mk
M starmath/inc/dialog.hxx
M starmath/inc/starmath.hrc
M starmath/source/dialog.cxx
M starmath/source/smres.src
A starmath/uiconfig/smath/ui/fontstypedialog.ui
6 files changed, 477 insertions(+), 100 deletions(-)
diff --git a/starmath/UI_smath.mk b/starmath/UI_smath.mk
index 6cbfb8d..109208f 100644
--- a/starmath/UI_smath.mk
+++ b/starmath/UI_smath.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,modules/smath))
$(eval $(call gb_UI_add_uifiles,modules/smath,\
+ starmath/uiconfig/smath/ui/fontstypedialog \
starmath/uiconfig/smath/ui/printeroptions \
))
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 51782f0..10a071a 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -155,27 +155,27 @@
class SmFontTypeDialog : public ModalDialog
{
-FixedText aFixedText1;
-SmFontPickListBox aVariableFont;
-FixedText aFixedText2;
-SmFontPickListBox aFunctionFont;
-FixedText aFixedText3;
-SmFontPickListBox aNumberFont;
-FixedText aFixedText4;
-SmFontPickListBox aTextFont;
-FixedText aFixedText5;
-SmFontPickListBox aSerifFont;
-FixedText aFixedText6;
-SmFontPickListBox aSansFont;
-FixedText aFixedText7;
-SmFontPickListBox aFixedFont;
-FixedLine aFixedLine1;
-FixedLine aFixedLine2;
-OKButtonaOKButton1;
-HelpButton aHelpButton1;
-CancelButtonaCancelButton1;
-MenuButton aMenuButton;
-PushButton aDefaultButton;
+//FixedText aFixedText1;
+//SmFontPickListBox aVariableFont;
+//FixedText aFixedText2;
+//SmFontPickListBox aFunctionFont;
+//FixedText aFixedText3;
+//SmFontPickListBox aNumberFont;
+//FixedText aFixedText4;
+//SmFontPickListBox aTextFont;
+//FixedText aFixedText5;
+//SmFontPickListBox aSerifFont;
+//FixedText aFixedText6;
+//SmFontPickListBox aSansFont;
+//FixedText aFixedText7;
+//SmFontPickListBox aFixedFont;
+//FixedLine aFixedLine1;
+//FixedLine aFixedLine2;
+OKButton*m_pBP_OK;
+//HelpButton aHelpButton1;
+//CancelButtonaCancelButton1;
+MenuButton* m_pBP_MenuButton;
+PushButton* m_pBP_DefaultButton;
OutputDevice *pFontListDev;
@@ -184,7 +184,7 @@
DECL_LINK(HelpButtonClickHdl, Button *);
public:
-SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, bool
bFreeRes = true);
+SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice/*, bool
bFreeRes = true*/);
void ReadFrom(const SmFormat rFormat);
void WriteTo (SmFormat rFormat) const;
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index ed1eb26..90ceb7a 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -81,7 +81,6 @@
#define RID_FONTDIALOG (RID_APP_START + 2)
#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
-#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
#define RID_DISTANCEDIALOG (RID_APP_START + 5)
#define RID_ALIGNDIALOG (RID_APP_START + 6)
#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 29c0328..ee90f9f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -511,13 +511,13 @@
bool bHideCheckboxes = false;
switch (pMenu-GetCurItemId())
{
-case 1: pActiveListBox = aVariableFont; break;
-case 2: pActiveListBox = aFunctionFont; break;
-case 3: pActiveListBox = aNumberFont; break;
-case 4: pActiveListBox = aTextFont; break;
-case 5: pActiveListBox = aSerifFont; bHideCheckboxes = true; break;
-case 6: pActiveListBox = aSansFont; bHideCheckboxes = true; break;
-case 7: pActiveListBox = aFixedFont; bHideCheckboxes = true; break;
+case 1: pActiveListBox = m_pLB_VariableFont; break;
+case 2: pActiveListBox = m_pLB_FunctionFont; break;
+case 3: pActiveListBox = m_pLB_NumberFont; break;
+case 4: pActiveListBox = m_pLB_TextFont; break;
+case 5: pActiveListBox = m_pLB_SerifFont ; bHideCheckboxes = true;
break;
+case 6: pActiveListBox = m_pLB_SansFont; bHideCheckboxes = true;
break;
+case 7: pActiveListBox = m_pLB_FixedFont; bHideCheckboxes = true;
[PATCH] Cleanup comments and some translations in style.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3062
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/3062/1
Cleanup comments and some translations in style.cxx
Change-Id: I18f0a3d9e9c97164691233e3c997f978d339e401
---
M svl/source/items/style.cxx
1 file changed, 10 insertions(+), 57 deletions(-)
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index eec3036..8de1508 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -56,9 +56,6 @@
TYPEINIT3(SfxStyleSheet, SfxStyleSheetBase, SfxListener, SfxBroadcaster)
-
-//=
-
TYPEINIT1(SfxStyleSheetHint, SfxHint);
TYPEINIT1(SfxStyleSheetHintExtended, SfxStyleSheetHint);
TYPEINIT1(SfxStyleSheetPoolHint, SfxHint);
@@ -73,7 +70,6 @@
aName( rOldName )
{}
-//-
SfxStyleSheetHint::SfxStyleSheetHint
(
@@ -84,7 +80,6 @@
nHint( nAction )
{}
-//=
class SfxStyleSheetBasePool_Impl
{
@@ -94,10 +89,6 @@
~SfxStyleSheetBasePool_Impl(){delete pIter;}
};
-
- SfxStyleSheetBase ///
-
-// Konstruktoren
SfxStyleSheetBase::SfxStyleSheetBase( const XubString rName,
SfxStyleSheetBasePool* p, SfxStyleFamily eFam, sal_uInt16 mask )
: pPool( p )
@@ -156,7 +147,7 @@
return 0x;
}
-// Namen aendern
+// Change name
const XubString SfxStyleSheetBase::GetName() const
{
@@ -208,7 +199,7 @@
maDisplayName = rDisplayName;
}
-// Parent aendern
+// Change Parent
const XubString SfxStyleSheetBase::GetParent() const
{
@@ -225,10 +216,10 @@
SfxStyleSheetBase* pIter = pPool-Find(rName, nFamily);
if( rName.Len() !pIter )
{
-OSL_FAIL( StyleSheet-Parent nicht gefunden );
+OSL_FAIL( StyleSheet-Parent not found );
return false;
}
-// rekursive Verknuepfungen verhindern
+// prevent recursive linkages
if( aName.Len() )
while(pIter)
{
@@ -248,7 +239,7 @@
pPool-Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
}
-// Follow aendern
+// Change follow
const XubString SfxStyleSheetBase::GetFollow() const
{
@@ -270,7 +261,7 @@
return true;
}
-// Itemset setzen. Die Dflt-Implementation legt ein neues Set an.
+// Set Itemset. The dflt-implementation creates a new set
SfxItemSet SfxStyleSheetBase::GetItemSet()
{
@@ -296,7 +287,7 @@
nHelpId = nId;
}
-// Folgevorlage moglich? Default: Ja
+// Next style possible? Default: Yes
bool SfxStyleSheetBase::HasFollowSupport() const
{
@@ -325,7 +316,6 @@
}
// eingestellte Attribute ausgeben
-
XubString SfxStyleSheetBase::GetDescription()
{
@@ -360,8 +350,6 @@
return aDesc;
}
-/// SfxStyleSheetIterator
///
-
SfxStyleFamily SfxStyleSheetIterator::GetSearchFamily() const
{
return nSearchFamily;
@@ -391,7 +379,6 @@
return bMatches;
}
-
SfxStyleSheetIterator::SfxStyleSheetIterator(SfxStyleSheetBasePool *pBase,
SfxStyleFamily eFam, sal_uInt16 n)
{
@@ -410,7 +397,6 @@
SfxStyleSheetIterator::~SfxStyleSheetIterator()
{
}
-
sal_uInt16 SfxStyleSheetIterator::Count()
{
@@ -446,7 +432,7 @@
++z;
}
}
-OSL_FAIL(falscher Index);
+OSL_FAIL(Incorrect index);
return 0;
}
@@ -523,7 +509,6 @@
return 0;
}
-
sal_uInt16 SfxStyleSheetIterator::GetSearchMask() const
{
sal_uInt16 mask = nMask;
@@ -533,7 +518,6 @@
return mask;
}
-/// SfxStyleSheetBasePool
///
void SfxStyleSheetBasePool::Replace(
SfxStyleSheetBase rSource, SfxStyleSheetBase rTarget )
@@ -556,7 +540,6 @@
}
return *rpIter;
}
-
SfxStyleSheetBasePool::SfxStyleSheetBasePool( SfxItemPool r )
: aAppName(r.GetName())
@@ -602,7 +585,7 @@
{
SfxStyleSheetIterator aIter(this,eFam,SFXSTYLEBIT_ALL);
SfxStyleSheetBase *pStyle = aIter.Find(rStyle);
-OSL_ENSURE(pStyle, Vorlage nicht gefunden. Writer mit Solar 2541??);
+OSL_ENSURE(pStyle, Template not found. Writer with solar 2541?);
if(pStyle)
return pStyle-SetParent(rParent);
else
@@ -620,9 +603,6 @@
return nMask;
}
-/// Factory
-
-
SfxStyleSheetIterator* SfxStyleSheetBasePool::CreateIterator
(
@@ -632,7 +612,6 @@
{
return new SfxStyleSheetIterator(this,eFam,mask);
}
-
SfxStyleSheetBase* SfxStyleSheetBasePool::Create
(
@@ -675,8 +654,6 @@
return *xStyle.get();
}
-/// Kopieren ///
-
// Hilfsroutine: Falls eine
[ABANDONED] fdo#62670 table splitting a table options are mixed
Joren De Cuyper has abandoned this change. Change subject: fdo#62670 table splitting a table options are mixed .. Patch Set 1: Abandoned pushed to early -- To view, visit https://gerrit.libreoffice.org/3038 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ied6ab0d3f8dce7092e1ea50b3a1838b170649334 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62670 table splitting a table options are mixed
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3038 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3038/1 fdo#62670 table splitting a table options are mixed Change-Id: Ied6ab0d3f8dce7092e1ea50b3a1838b170649334 --- M sw/source/ui/table/splittbl.cxx 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index f82d642..f9ec9d7 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -30,7 +30,7 @@ get(mpCntntCopyRB, copyheading); get(mpBoxAttrCopyWithParaRB, customheadingapplystyle); get(mpBoxAttrCopyNoParaRB, customheading); -get(mpBorderCopyRB, customheading); +get(mpBorderCopyRB, noheading); } void SwSplitTblDlg::Apply() @@ -45,7 +45,5 @@ rShell.SplitTable(m_nSplit); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- To view, visit https://gerrit.libreoffice.org/3038 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied6ab0d3f8dce7092e1ea50b3a1838b170649334 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix fdo#62670 - TABLE: Splitting a table options are mixed
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3041 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/3041/1 fix fdo#62670 - TABLE: Splitting a table options are mixed Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b --- M sw/source/ui/table/splittbl.cxx 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index f82d642..d85bb95 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -30,7 +30,7 @@ get(mpCntntCopyRB, copyheading); get(mpBoxAttrCopyWithParaRB, customheadingapplystyle); get(mpBoxAttrCopyNoParaRB, customheading); -get(mpBorderCopyRB, customheading); +get(mpBorderCopyRB, noheading); } void SwSplitTblDlg::Apply() @@ -38,14 +38,12 @@ m_nSplit = HEADLINE_CNTNTCOPY; if(mpBoxAttrCopyWithParaRB-IsChecked()) m_nSplit = HEADLINE_BOXATRCOLLCOPY; -if(mpBoxAttrCopyNoParaRB-IsChecked()) +else if(mpBoxAttrCopyNoParaRB-IsChecked()) m_nSplit = HEADLINE_BOXATTRCOPY; else if(mpBorderCopyRB-IsChecked()) m_nSplit = HEADLINE_BORDERCOPY; rShell.SplitTable(m_nSplit); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- To view, visit https://gerrit.libreoffice.org/3041 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fix fdo#62670 - TABLE: Splitting a table options are mixed
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3042 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3042/1 fix fdo#62670 - TABLE: Splitting a table options are mixed Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b --- M sw/source/ui/table/splittbl.cxx 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index f82d642..d85bb95 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -30,7 +30,7 @@ get(mpCntntCopyRB, copyheading); get(mpBoxAttrCopyWithParaRB, customheadingapplystyle); get(mpBoxAttrCopyNoParaRB, customheading); -get(mpBorderCopyRB, customheading); +get(mpBorderCopyRB, noheading); } void SwSplitTblDlg::Apply() @@ -38,14 +38,12 @@ m_nSplit = HEADLINE_CNTNTCOPY; if(mpBoxAttrCopyWithParaRB-IsChecked()) m_nSplit = HEADLINE_BOXATRCOLLCOPY; -if(mpBoxAttrCopyNoParaRB-IsChecked()) +else if(mpBoxAttrCopyNoParaRB-IsChecked()) m_nSplit = HEADLINE_BOXATTRCOPY; else if(mpBorderCopyRB-IsChecked()) m_nSplit = HEADLINE_BORDERCOPY; rShell.SplitTable(m_nSplit); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- To view, visit https://gerrit.libreoffice.org/3042 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-2] fix fdo#62670 - TABLE: Splitting a table options are mixed
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3043 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/3043/1 fix fdo#62670 - TABLE: Splitting a table options are mixed Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b --- M sw/source/ui/table/splittbl.cxx 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index f82d642..d85bb95 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -30,7 +30,7 @@ get(mpCntntCopyRB, copyheading); get(mpBoxAttrCopyWithParaRB, customheadingapplystyle); get(mpBoxAttrCopyNoParaRB, customheading); -get(mpBorderCopyRB, customheading); +get(mpBorderCopyRB, noheading); } void SwSplitTblDlg::Apply() @@ -38,14 +38,12 @@ m_nSplit = HEADLINE_CNTNTCOPY; if(mpBoxAttrCopyWithParaRB-IsChecked()) m_nSplit = HEADLINE_BOXATRCOLLCOPY; -if(mpBoxAttrCopyNoParaRB-IsChecked()) +else if(mpBoxAttrCopyNoParaRB-IsChecked()) m_nSplit = HEADLINE_BOXATTRCOPY; else if(mpBorderCopyRB-IsChecked()) m_nSplit = HEADLINE_BORDERCOPY; rShell.SplitTable(m_nSplit); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- To view, visit https://gerrit.libreoffice.org/3043 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-2 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60462 - Small errors in the layout margins of the text b...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2970
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/2970/1
fdo#60462 - Small errors in the layout margins of the text boxes
As you can see on this screenshot
https://bugs.freedesktop.org/attachment.cgi?id=74399 there was a margin
problem. The X-position of the text box is at 0.05, but the
width was only 0.88 so we had 0.02 _extra_ on the right side. This is the
width of that little margin error. Fixing it by setting Layoutsize width
to 0.90, so we have on both side a nice 0.05 margin.
Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
---
M sd/source/core/sdpage.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5c4337f..e943e89 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1052,7 +1052,7 @@
{
aLayoutPos.X() += long( aLayoutSize.Width() * 0.05 );
aLayoutPos.Y() += long( aLayoutSize.Height() * 0.234 );
-aLayoutSize.Width() = long( aLayoutSize.Width() * 0.88 );
+aLayoutSize.Width() = long( aLayoutSize.Width() * 0.9 );
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.58 );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
--
To view, visit https://gerrit.libreoffice.org/2970
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-2] fdo#60462 - Small errors in the layout margins of the text b...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2971
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/2971/1
fdo#60462 - Small errors in the layout margins of the text boxes
As you can see on this screenshot
https://bugs.freedesktop.org/attachment.cgi?id=74399 there was a margin
problem. The X-position of the text box is at 0.05, but the
width was only 0.88 so we had 0.02 _extra_ on the right side. This is the
width of that little margin error. Fixing it by setting Layoutsize width
to 0.90, so we have on both side a nice 0.05 margin.
Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
---
M sd/source/core/sdpage.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5c4337f..e943e89 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1052,7 +1052,7 @@
{
aLayoutPos.X() += long( aLayoutSize.Width() * 0.05 );
aLayoutPos.Y() += long( aLayoutSize.Height() * 0.234 );
-aLayoutSize.Width() = long( aLayoutSize.Width() * 0.88 );
+aLayoutSize.Width() = long( aLayoutSize.Width() * 0.9 );
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.58 );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
--
To view, visit https://gerrit.libreoffice.org/2971
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#60462 - Small errors in the layout margins of the text b...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2972
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/2972/1
fdo#60462 - Small errors in the layout margins of the text boxes
As you can see on this screenshot
https://bugs.freedesktop.org/attachment.cgi?id=74399 there was a margin
problem. The X-position of the text box is at 0.05, but the
width was only 0.88 so we had 0.02 _extra_ on the right side. This is the
width of that little margin error. Fixing it by setting Layoutsize width
to 0.90, so we have on both side a nice 0.05 margin.
Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
---
M sd/source/core/sdpage.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5c4337f..e943e89 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1052,7 +1052,7 @@
{
aLayoutPos.X() += long( aLayoutSize.Width() * 0.05 );
aLayoutPos.Y() += long( aLayoutSize.Height() * 0.234 );
-aLayoutSize.Width() = long( aLayoutSize.Width() * 0.88 );
+aLayoutSize.Width() = long( aLayoutSize.Width() * 0.9 );
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.58 );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
--
To view, visit https://gerrit.libreoffice.org/2972
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6-6] fdo#60462 - Small errors in the layout margins of the text b...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2973
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/2973/1
fdo#60462 - Small errors in the layout margins of the text boxes
As you can see on this screenshot
https://bugs.freedesktop.org/attachment.cgi?id=74399 there was a margin
problem. The X-position of the text box is at 0.05, but the
width was only 0.88 so we had 0.02 _extra_ on the right side. This is the
width of that little margin error. Fixing it by setting Layoutsize width
to 0.90, so we have on both side a nice 0.05 margin.
Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
---
M sd/source/core/sdpage.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5c4337f..e943e89 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1052,7 +1052,7 @@
{
aLayoutPos.X() += long( aLayoutSize.Width() * 0.05 );
aLayoutPos.Y() += long( aLayoutSize.Height() * 0.234 );
-aLayoutSize.Width() = long( aLayoutSize.Width() * 0.88 );
+aLayoutSize.Width() = long( aLayoutSize.Width() * 0.9 );
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.58 );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
--
To view, visit https://gerrit.libreoffice.org/2973
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-6
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#60462 - Small errors in the layout margins of the text b...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2974
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/2974/1
fdo#60462 - Small errors in the layout margins of the text boxes
As you can see on this screenshot
https://bugs.freedesktop.org/attachment.cgi?id=74399 there was a margin
problem. The X-position of the text box is at 0.05, but the
width was only 0.88 so we had 0.02 _extra_ on the right side. This is the
width of that little margin error. Fixing it by setting Layoutsize width
to 0.90, so we have on both side a nice 0.05 margin.
Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
---
M sd/source/core/sdpage.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5c4337f..e943e89 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1052,7 +1052,7 @@
{
aLayoutPos.X() += long( aLayoutSize.Width() * 0.05 );
aLayoutPos.Y() += long( aLayoutSize.Height() * 0.234 );
-aLayoutSize.Width() = long( aLayoutSize.Width() * 0.88 );
+aLayoutSize.Width() = long( aLayoutSize.Width() * 0.9 );
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.58 );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
--
To view, visit https://gerrit.libreoffice.org/2974
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#34800 Comments added to footer are placed at the right t...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2777
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/2777/1
fdo#34800 Comments added to footer are placed at the right top of the page.
I also merged (manually) the changes of the cleanup
commit of Michael Stahl ( commit id 859e94294bdfd8595c88dd7f14da09ead8b32a45 )
Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Reviewed-on: https://gerrit.libreoffice.org/2572
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
---
M sw/source/ui/docvw/PostItMgr.cxx
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 3a24565..a573147 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -90,7 +90,33 @@
bool comp_pos(const SwSidebarItem* a, const SwSidebarItem* b)
{
// sort by anchor position
-return a-GetAnchorPosition() b-GetAnchorPosition();
+SwPosition aPosAnchorA = a-GetAnchorPosition();
+SwPosition aPosAnchorB = b-GetAnchorPosition();
+
+bool aAnchorAInFooter = false;
+bool aAnchorBInFooter = false;
+
+// is the anchor placed in Footnote or the Footer?
+if( aPosAnchorA.nNode.GetNode().FindFootnoteStartNode() ||
aPosAnchorA.nNode.GetNode().FindFooterStartNode() )
+aAnchorAInFooter = true;
+if( aPosAnchorB.nNode.GetNode().FindFootnoteStartNode() ||
aPosAnchorB.nNode.GetNode().FindFooterStartNode() )
+aAnchorBInFooter = true;
+
+// fdo#34800
+// if AnchorA is in footnote, and AnchorB isn't
+// we do not want to change over the position
+if( aAnchorAInFooter !aAnchorBInFooter )
+return false;
+// if aAnchorA is not placed in a footnote, and aAnchorB is
+// force a change over
+else if( !aAnchorAInFooter aAnchorBInFooter )
+return true;
+// If neither or both are in the footer, compare the positions.
+// Since footnotes are in Inserts section of nodes array and footers
+// in Autotext section, all footnotes precede any footers so no need
+// to check that.
+else
+return aPosAnchorA aPosAnchorB;
}
SwPostItMgr::SwPostItMgr(SwView* pView)
--
To view, visit https://gerrit.libreoffice.org/2777
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Return true or false instead of a 1 or 0 in this function
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2761
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/2761/1
Return true or false instead of a 1 or 0 in this function
Change-Id: I223a342aa9496674714929e0dc78bc53b30273a2
---
M sw/source/ui/docvw/PostItMgr.cxx
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 1a7c063..1b6531d 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -87,9 +87,9 @@
using namespace sw::sidebarwindows;
+// sort depending on position
bool comp_pos(const SwSidebarItem* a, const SwSidebarItem* b)
{
-// sort by anchor position
SwPosition aPosAnchorA = a-GetAnchorPosition();
SwPosition aPosAnchorB = b-GetAnchorPosition();
@@ -106,11 +106,11 @@
// if AnchorA is in footnote, and AnchorB isn't
// we do not want to change over the position
if( aAnchorAInFooter !aAnchorBInFooter )
-return 0;
+return false;
// if aAnchorA is not placed in a footnote, and aAnchorB is
// force a change over
else if( !aAnchorAInFooter aAnchorBInFooter )
-return 1;
+return true;
// if none of both, or both are in the footer
// arrange them depending on the position
else
--
To view, visit https://gerrit.libreoffice.org/2761
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I223a342aa9496674714929e0dc78bc53b30273a2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62075 Hierarchical filter hard to find
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2638 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/2638/1 fdo#62075 Hierarchical filter hard to find See UX-advice http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-March/001898.html and comment on bug for approval of ux-advice. Change-Id: I0e3eb178eb74476edad6aad724e1ccc2a05662da --- M sfx2/source/dialog/templdlg.cxx 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 404f0c9..1dc8689 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -83,8 +83,8 @@ static sal_uInt16 nLastItemId = USHRT_MAX; -// filter box has maximum 12 entries visible -#define MAX_FILTER_ENTRIES 12 +// filter box has maximum 14 entries visible +#define MAX_FILTER_ENTRIES 14 //= @@ -1235,7 +1235,7 @@ if(pTreeBox) aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString()); -// show maximum 12 entries +// show maximum 14 entries aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES ); aFilterLb.SetUpdateMode(sal_True); } -- To view, visit https://gerrit.libreoffice.org/2638 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e3eb178eb74476edad6aad724e1ccc2a05662da Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#62075 Hierarchical filter hard to find
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2639 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/2639/1 fdo#62075 Hierarchical filter hard to find See UX-advice http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-March/001898.html and comment on bug for approval of ux-advice. Change-Id: Ie5af5ec141b148e6253d0ffa9b546d30994c6dd6 --- M sfx2/source/dialog/templdlg.cxx 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 0af6d77..a81c27d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -83,8 +83,8 @@ static sal_uInt16 nLastItemId = USHRT_MAX; -// filter box has maximum 12 entries visible -#define MAX_FILTER_ENTRIES 12 +// filter box has maximum 14 entries visible +#define MAX_FILTER_ENTRIES 14 //= @@ -1281,7 +1281,7 @@ if(pTreeBox) aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString()); -// show maximum 12 entries +// show maximum 14 entries aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES ); aFilterLb.SetUpdateMode(sal_True); } -- To view, visit https://gerrit.libreoffice.org/2639 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5af5ec141b148e6253d0ffa9b546d30994c6dd6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Translate german comments in sw/source/filter/ww8/wrtww8.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2617
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/2617/1
Translate german comments in sw/source/filter/ww8/wrtww8.cxx
Please, only apply this patch if you are a native speaking German.
I'm not a native speaker, so a double check is really necessary
and appreciated.
Thanks in advance.
Change-Id: Ic2fb6e97007c6b47851ad8a7a51e987da5a70877
---
M sw/source/filter/ww8/docxexportfilter.cxx
M sw/source/filter/ww8/wrtw8nds.cxx
M sw/source/filter/ww8/wrtw8num.cxx
M sw/source/filter/ww8/wrtww8.hxx
M sw/source/filter/ww8/wrtww8gr.cxx
5 files changed, 114 insertions(+), 127 deletions(-)
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx
b/sw/source/filter/ww8/docxexportfilter.cxx
index 8149b36..2226ed3 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -86,10 +86,8 @@
return true;
}
-//
-// UNO stuff so that the filter is registered
-//
+// UNO stuff so that the filter is registered
#define IMPL_NAME com.sun.star.comp.Writer.DocxExport
OUString DocxExport_getImplementationName()
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 9881fff..3112569 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -315,13 +315,13 @@
for( i = 0; i pTxtAttrs-Count(); i++ )
{
const SwTxtAttr* pHt = (*pTxtAttrs)[i];
-nPos = *pHt-GetStart();// gibt erstes Attr-Zeichen
+nPos = *pHt-GetStart();// give first Attr characters
if( nPos = nStartPos nPos = nMinPos )
nMinPos = nPos;
-if( pHt-GetEnd() ) // Attr mit Ende
+if( pHt-GetEnd() ) // Attr to end
{
-nPos = *pHt-GetEnd(); // gibt letztes Attr-Zeichen + 1
+nPos = *pHt-GetEnd(); // give last Attr character + 1
if( nPos = nStartPos nPos = nMinPos )
nMinPos = nPos;
}
@@ -482,7 +482,7 @@
m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript() );
-// HasTextItem nur in dem obigen Bereich erlaubt
+// HasTextItem only allowed in the above range
m_rExport.m_aCurrentCharPropStarts.pop();
m_rExport.pOutFmtNode = pOldMod;
}
@@ -580,12 +580,11 @@
return false;
}
-// HasItem ist fuer die Zusammenfassung des Doppel-Attributes Underline
-// und WordLineMode als TextItems. OutAttr() ruft die Ausgabefunktion,
-// die dann ueber HasItem() nach anderen Items an der
-// Attribut-Anfangposition fragen kann.
-// Es koennen nur Attribute mit Ende abgefragt werden.
-// Es wird mit bDeep gesucht
+//HasItem is for the summary of the double attributes: Underline and
WordlineMode as TextItems.
+// OutAttr () calls the output function, which can then can call HasItem ()
for other items at the
+// beginning of the selected position.
+// It can only be retrieved by the end attributes.
+// It searches with bDeep
const SfxPoolItem* SwWW8AttrIter::HasTextItem( sal_uInt16 nWhich ) const
{
const SfxPoolItem* pRet = 0;
@@ -599,15 +598,15 @@
const SwTxtAttr* pHt = (*pTxtAttrs)[i];
const SfxPoolItem* pItem = pHt-GetAttr();
const xub_StrLen* pAtrEnd = 0;
-if( 0 != ( pAtrEnd = pHt-GetEnd() ) // nur Attr mit Ende
-nWhich == pItem-Which() //
+if( 0 != ( pAtrEnd = pHt-GetEnd() ) // only Attr with an
end
+nWhich == pItem-Which()
nTmpSwPos = *pHt-GetStart() nTmpSwPos *pAtrEnd )
{
-pRet = pItem; // gefunden
+pRet = pItem; // found it
break;
}
else if (nTmpSwPos *pHt-GetStart())
-break; // dann kommt da nichts mehr
+break; // nothing more to come
}
}
return pRet;
@@ -856,7 +855,7 @@
sal_uLong nDataStt = m_rWW8Export.pDataStrm-Tell();
m_rWW8Export.pChpPlc-AppendFkpEntry( m_rWW8Export.Strm().Tell() );
-// WinWord 2000 doesn't write this - so its a temp solution by W97 ?
+// WinWord 2000 doesn't write this - so its a temp solution by W97 ?
m_rWW8Export.WriteChar( 0x01 );
static sal_uInt8 aArr1[] = {
@@ -974,7 +973,6 @@
// an write some data to the data stream, but dont ask
// what the data mean, except for the URL.
// The First piece is the WW8_PIC structure.
-//
static sal_uInt8 MAGIC_B[] = {
0xE0,0xC9,0xEA,0x79,0xF9,0xBA,0xCE,0x11,
0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B
@@ -1177,7 +1175,7 @@
[PATCH] Minor improvements and UX-advice related to fdo#46718 delete...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2618
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/2618/1
Minor improvements and UX-advice related to fdo#46718 delete multi style
UX advice see:
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-February/001816.html
Summary: only show a dialog when the user is trying to delete an used
style. Also warn him this change can only be partly undone (for now).
Change-Id: Ib95143fcd4c7543f518e0d7fd4ff46a127efca2a
---
M sfx2/source/dialog/dialog.src
M sfx2/source/dialog/templdlg.cxx
2 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index f23deb1..c430d1a 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -56,13 +56,9 @@
{
Message [ en-US ] = Name already exists as a default Style.\nPlease
choose another name. ;
};
-String STR_DELETE_STYLE
-{
-Text [ en-US ] = Do you really want to delete Style $1? ;
-};
String STR_DELETE_STYLE_USED
{
-Text [ en-US ] = You are deleting an applied Style!\n ;
+Text [ en-US ] = One or more of the selected styles is in use in this
document.\nIf you delete these styles, text will revert to the parent
style.\nThis operation may not be undone. ;
};
Menu MN_CONTEXT_TEMPLDLG
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 404f0c9..10ac8b6 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1970,77 +1970,68 @@
{
if ( IsInitialized() HasSelectedStyle() )
{
-sal_uLong SelectionCount = 0;
-sal_Bool bChecked = 0;
+bool aApprove = 0; // use to skip the dialog
+bool bUsedStyle = 0; // one of the selected styles are used in the
document?
String aRet;
-SelectionCount = aFmtLb.GetSelectionCount();
std::vectorSvTreeListEntry* aList;
-
SvTreeListEntry* pEntry = aFmtLb.FirstSelected();
+const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
while (pEntry)
{
aList.push_back( pEntry );
+// check the style is used or not
+if (pTreeBox)
+aRet = pTreeBox-GetEntryText( pEntry );
+else
+aRet = aFmtLb.GetEntryText( pEntry );
+
+const String aTemplName( aRet );
+SfxStyleSheetBase* pStyle = pStyleSheetPool-Find( aTemplName,
pItem-GetFamily(), SFXSTYLEBIT_ALL );
+
+if ( !bUsedStyle pStyle-IsUsed() ) // pStyle is in use in the
document?
+bUsedStyle = 1;
+
pEntry = aFmtLb.NextSelected( pEntry );
-SelectionCount++;
}
std::vectorSvTreeListEntry*::const_iterator it = aList.begin(),
itEnd = aList.end();
for (; it != itEnd; ++it)
{
+// we only want to show the dialog once and if we want to delete a
style in use (UX-advice)
+if ( bUsedStyle !aApprove )
+{
+String aMsg = SfxResId(STR_DELETE_STYLE_USED).toString();
+#if defined UNX
+QueryBox aBox( SFX_APP()-GetTopWindow(), WB_YES_NO |
WB_DEF_NO, aMsg );
+#else
+QueryBox aBox( GetWindow(), WB_YES_NO | WB_DEF_NO , aMsg );
+#endif
+aApprove = aBox.Execute() == RET_YES;
+if ( aApprove == 0 )
+break;
+}
+else
+aApprove = 1;
+
if (pTreeBox)
aRet = pTreeBox-GetEntryText( *it );
else
aRet = aFmtLb.GetEntryText( *it );
+
const String aTemplName( aRet );
+PrepareDeleteAction();
+bDontUpdate = sal_True; // To prevent the Treelistbox to shut down
while deleting
+Execute_Impl( SID_STYLE_DELETE, aTemplName,
+ String(),
(sal_uInt16)GetFamilyItem_Impl()-GetFamily() );
-const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
-
-SfxStyleSheetBase* pStyle = pStyleSheetPool-Find( aTemplName,
pItem-GetFamily(), SFXSTYLEBIT_ALL );
-
-bool bUsedStyle = pStyle-IsUsed();
-bool approve;
-
-if ( bChecked == 0 )
+if ( pTreeBox )
{
-String aMsg;
-if ( bUsedStyle )
-aMsg = SfxResId(STR_DELETE_STYLE_USED).toString();
-aMsg += SfxResId(STR_DELETE_STYLE).toString();
-aMsg.SearchAndReplaceAscii( $1, aTemplName );
-#if defined UNX
-QueryBox aBox( SFX_APP()-GetTopWindow(), WB_YES_NO |
WB_DEF_NO, aMsg );
-#else
-QueryBox aBox( GetWindow(), WB_YES_NO | WB_DEF_NO , aMsg );
-#endif
-if (SelectionCount 1) //show only when there are multiple
styles selected/to
[PATCH] Translate german comments in sw/source/filter/ww8/wrtww8.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2589
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/2589/1
Translate german comments in sw/source/filter/ww8/wrtww8.cxx
Please, only apply this patch if you are a native speaking German.
I'm not a native speaker, so a double check is really necessary
and appreciated.
Thanks in advance.
Change-Id: I4df75b92ea7a66552df36f56de1c87d567d5b643
---
M sw/source/filter/ww8/wrtww8.cxx
1 file changed, 106 insertions(+), 116 deletions(-)
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index f19c11b..f661fc8 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -78,7 +78,7 @@
#include svtools/imapobj.hxx
#include tools/urlobj.hxx
#include mdiexp.hxx // Progress
-#include statstr.hrc // ResId fuer Statusleiste
+#include statstr.hrc // ResId for the status list
#include fmtline.hxx
#include fmtfsize.hxx
#include comphelper/extract.hxx
@@ -117,15 +117,15 @@
*/
class WW8_WrFkp
{
-sal_uInt8* pFkp; // gesamter Fkp ( zuerst nur FCs und Sprms )
-sal_uInt8* pOfs; // Pointer auf Offset-Bereich, spaeter nach pFkp
kopiert
+sal_uInt8* pFkp; // Fkp total ( first and only FCs and Sprms )
+sal_uInt8* pOfs; // pointer to the offset area, later copied by
pFkp
ePLCFT ePlc;
short nStartGrp;// ab hier grpprls
short nOldStartGrp;
sal_uInt8 nItemSize;
-sal_uInt8 nIMax; // Anzahl der Eintrags-Paare
+sal_uInt8 nIMax; // number of entry pairs
sal_uInt8 nOldVarLen;
-bool bCombined; // true : Einfuegen verboten
+bool bCombined; // true : paste not allowed
sal_uInt8 SearchSameSprm( sal_uInt16 nVarLen, const sal_uInt8* pSprms );
public:
@@ -155,15 +155,12 @@
};
-// -
-// class WW8_WrPc sammelt alle Piece-Eintraege fuer ein Piece
-// -
-
+// class WW8_WrPc collects all entry pieces for one piece
class WW8_WrPc
{
-WW8_CP nStartCp;// Start ZeichenPosition vom Text
-WW8_FC nStartFc;// Start File Position vom Text
-sal_uInt16 nStatus; // Absatzende im Piece ?
+WW8_CP nStartCp;// Starting character position of the
text
+WW8_FC nStartFc;// Starting position of the text file
+sal_uInt16 nStatus; // End of the piece ?
public:
WW8_WrPc(WW8_FC nSFc, WW8_CP nSCp )
@@ -213,7 +210,7 @@
#define ANZ_DEFAULT_STYLES 16
-// die Namen der StorageStreams
+// Names of the storage stream
#define sMainStream rtl::OUString(WordDocument)
#define sCompObj rtl::OUString(\1CompObj)
@@ -221,19 +218,19 @@
{
WW8Dop rDop = *rWrt.pDop;
-// i#78951#, store the value of unknown compatability options
+// i#78951#, store the value of unknown compatability options
rDop.SetCompatabilityOptions(
rWrt.pDoc-Getn32DummyCompatabilityOptions1());
rDop.SetCompatabilityOptions2(
rWrt.pDoc-Getn32DummyCompatabilityOptions2());
rDop.fNoLeading = !rWrt.pDoc-get(IDocumentSettingAccess::ADD_EXT_LEADING);
rDop.fUsePrinterMetrics =
!rWrt.pDoc-get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE);
-// default TabStop schreiben
+// write default TabStop
const SvxTabStopItem rTabStop =
DefaultItemGetSvxTabStopItem(*rWrt.pDoc, RES_PARATR_TABSTOP);
rDop.dxaTab = (sal_uInt16)rTabStop[0].GetTabPos();
-// Zoom factor.
+// Zoom factor
ViewShell *pViewShell(rWrt.pDoc-GetCurrentViewShell());
if (pViewShell pViewShell-GetViewOptions()-GetZoomType() ==
SVX_ZOOM_PERCENT)
rDop.wScaleSaved = pViewShell-GetViewOptions()-GetZoom();
@@ -276,9 +273,12 @@
rDop.fProtEnabled = 0;
}
-if (!xDocProps.is()) {
+if (!xDocProps.is())
+{
rDop.dttmCreated = rDop.dttmRevised = rDop.dttmLastPrint = 0x45FBAC69;
-} else {
+}
+else
+{
::util::DateTime uDT = xDocProps-getCreationDate();
Date aD(uDT.Day, uDT.Month, uDT.Year);
Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.HundredthSeconds);
@@ -291,14 +291,12 @@
Date aD3(uDT.Day, uDT.Month, uDT.Year);
Time aT3(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.HundredthSeconds);
rDop.dttmLastPrint = sw::ms::DateTime2DTTM(DateTime(aD3,aT3));
-
}
-// auch damit werden die DocStat-Felder in Kopf-/Fusszeilen nicht korrekt
-// berechnet.
-// ( we do not have this fields! )
+// Also, the DocStat fields in headers, footers are not calculated
correctly.
+// ( we do not have this fields! )
-// und noch fuer die Header und Footers
+// and also for the Headers and Footers
rDop.cWordsFtnEnd = rDStat.nWord;
[PATCH] It is safer to uncomment these checks in the postithelper
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2567
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/2567/1
It is safer to uncomment these checks in the postithelper
Change-Id: I84d96224dbe51ff25fcb6d96e0be9a8dff89b0a1
---
M sw/source/core/fields/postithelper.cxx
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sw/source/core/fields/postithelper.cxx
b/sw/source/core/fields/postithelper.cxx
index 5706319..b68fe12 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -165,16 +165,16 @@
SwPosition SwAnnotationItem::GetAnchorPosition() const
{
SwTxtFld* pFld = pFmtFld-GetTxtFld();
-//if( pFld )
-//{
+if( pFld )
+{
SwTxtNode* pTNd = pFld-GetpTxtNode();
-// if( pTNd )
-// {
+if( pTNd )
+{
SwPosition aPos( *pTNd );
aPos.nContent.Assign( pTNd, *pFld-GetStart() );
return aPos;
-// }
-//}
+}
+}
}
bool SwAnnotationItem::UseElement()
--
To view, visit https://gerrit.libreoffice.org/2567
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84d96224dbe51ff25fcb6d96e0be9a8dff89b0a1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] WaE: return a value if the checks does not succeed in GetAnc...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2568 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/2568/1 WaE: return a value if the checks does not succeed in GetAnchorPosition Change-Id: Id9a9f5ba2299f103804b8f66c7dc5d1e5429187b --- M sw/source/core/fields/postithelper.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx index b68fe12..0e80c28 100644 --- a/sw/source/core/fields/postithelper.cxx +++ b/sw/source/core/fields/postithelper.cxx @@ -175,6 +175,7 @@ return aPos; } } +return NULL; } bool SwAnnotationItem::UseElement() -- To view, visit https://gerrit.libreoffice.org/2568 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9a9f5ba2299f103804b8f66c7dc5d1e5429187b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] WaE: return a value if the checks does not succeed in GetAnc...
Joren De Cuyper has abandoned this change. Change subject: WaE: return a value if the checks does not succeed in GetAnchorPosition .. Patch Set 1: Abandoned to risky to return a NULL because of a NULL NULL check. Will fix it in another way soon -- To view, visit https://gerrit.libreoffice.org/2568 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Id9a9f5ba2299f103804b8f66c7dc5d1e5429187b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] delete previous uncommented comments in positionhelper.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2571
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/2571/1
delete previous uncommented comments in positionhelper.cxx
Change-Id: I0f177a078b915c1220423ea583e749de4d02e384
---
M sw/source/core/fields/postithelper.cxx
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/sw/source/core/fields/postithelper.cxx
b/sw/source/core/fields/postithelper.cxx
index b68fe12..1937cee 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -165,16 +165,11 @@
SwPosition SwAnnotationItem::GetAnchorPosition() const
{
SwTxtFld* pFld = pFmtFld-GetTxtFld();
-if( pFld )
-{
-SwTxtNode* pTNd = pFld-GetpTxtNode();
-if( pTNd )
-{
-SwPosition aPos( *pTNd );
-aPos.nContent.Assign( pTNd, *pFld-GetStart() );
-return aPos;
-}
-}
+SwTxtNode* pTNd = pFld-GetpTxtNode();
+
+SwPosition aPos( *pTNd );
+aPos.nContent.Assign( pTNd, *pFld-GetStart() );
+return aPos;
}
bool SwAnnotationItem::UseElement()
--
To view, visit https://gerrit.libreoffice.org/2571
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f177a078b915c1220423ea583e749de4d02e384
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Bug 34800 Comments added to footer are placed at the right t...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2572
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/2572/1
Bug 34800 Comments added to footer are placed at the right top of the page.
The problem is that the nodes in the footnote are stored before
nodes of the document body in the internal structure.
Therefore I wrote this patch to check if the compared
comments are in the footnote (one, both or both not).
Special thanks to Cédric Bosdonnat
Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
---
M sw/source/ui/docvw/PostItMgr.cxx
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index cd94ba0..5465ecf 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -90,7 +90,25 @@
bool comp_pos(const SwSidebarItem* a, const SwSidebarItem* b)
{
// sort by anchor position
-return a-GetAnchorPosition() b-GetAnchorPosition();
+SwPosition aPosAnchorA = a-GetAnchorPosition();
+SwPosition aPosAnchorB = b-GetAnchorPosition();
+
+bool aAnchorAInFooter =
aPosAnchorA.nNode.GetNode().FindFootnoteStartNode() != NULL;
+bool aAnchorBInFooter =
aPosAnchorB.nNode.GetNode().FindFootnoteStartNode() != NULL;
+
+// fdo#34800
+// if AnchorA is in footnote, and AnchorB isn't
+// we do not want to change over the position
+if( aAnchorAInFooter !aAnchorBInFooter )
+return NULL;
+// if AnchorA is not placed in a footnote, and AnchorB is
+// force a change over
+else if( !aAnchorAInFooter aAnchorBInFooter )
+return 1;
+// if none of both, or both are in the footer
+// arrange them depending on the position
+else
+return aPosAnchorA aPosAnchorB;
}
SwPostItMgr::SwPostItMgr(SwView* pView)
--
To view, visit https://gerrit.libreoffice.org/2572
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Translate german comments in wrtw8sty.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2575
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/2575/1
Translate german comments in wrtw8sty.cxx
Please, only apply this patch if you are native speaking German.
I'm not a native speaker, so a double check is really necessary
and appreciated.
Thanks in advance.
Change-Id: Iee7603c3fb8d78b951b967bd5942df4b1e9634f6
---
M sw/source/filter/ww8/wrtw8sty.cxx
1 file changed, 75 insertions(+), 77 deletions(-)
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 4c9e80f..a5a8efd 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -94,12 +94,12 @@
// cbSED is 12 (decimal)), C (hex).
};
-// class WW8_WrPlc0 ist erstmal nur fuer Header / Footer-Positionen, d.h. es
-// gibt keine inhaltstragende Struktur.
+// class WW8_WrPlc0 is only used for header and footer positioning
+// ie there is no content support structure
class WW8_WrPlc0
{
private:
-std::vectorsal_uLong aPos; // PTRARR von CPs / FCs
+std::vectorsal_uLong aPos; // PTRARR of CPs / FCs
sal_uLong nOfs;
//No copying
@@ -118,16 +118,16 @@
#define WW8_RESERVED_SLOTS 15
-// GetId( SwCharFmt ) zur Benutzung im Text - nil verboten,
-// Default Char Style stattdessen
+// GetId( SwCharFmt ) for use in text - zero is not allowed,
+// use Default Char Style instead
sal_uInt16 MSWordExportBase::GetId( const SwCharFmt rFmt ) const
{
sal_uInt16 nRet = pStyles-GetSlot( rFmt );
return ( nRet != 0x0fff ) ? nRet : 10; // Default Char Style
}
-// GetId( SwTxtFmtColl ) zur Benutzung an TextNodes - nil verboten,
-// Standard stattdessen
+// GetId( SwTxtFmtColl ) for use in TextNodes - zero is not allowed,
+// Standard instead
sal_uInt16 MSWordExportBase::GetId( const SwTxtFmtColl rColl ) const
{
sal_uInt16 nRet = pStyles-GetSlot( rColl );
@@ -152,7 +152,7 @@
sal_uInt16 nAlloc = WW8_RESERVED_SLOTS +
m_rExport.pDoc-GetCharFmts()-size() - 1 +
m_rExport.pDoc-GetTxtFmtColls()-size() - 1;
-// etwas grosszuegig ( bis zu 15 frei )
+// somewhat generous ( free for up to 15 )
pFmtA = new SwFmt*[ nAlloc ];
memset( pFmtA, 0, nAlloc * sizeof( SwFmt* ) );
@@ -164,14 +164,14 @@
delete[] pFmtA;
}
-// Sty_SetWWSlot() fuer Abhaengigkeiten der Styles - nil ist erlaubt
+// Sty_SetWWSlot() dependencies for the styles - zero is allowed
sal_uInt16 MSWordStyles::GetSlot( const SwFmt rFmt ) const
{
sal_uInt16 n;
for ( n = 0; n nUsedSlots; n++ )
if ( pFmtA[n] == rFmt )
return n;
-return 0xfff; // 0xfff: WW: nil
+return 0xfff; // 0xfff: WW: zero
}
sal_uInt16 MSWordStyles::BuildGetSlot( const SwFmt rFmt )
@@ -275,7 +275,7 @@
{
nUsedSlots = WW8_RESERVED_SLOTS;// soviele sind reserviert fuer
// Standard und HeadingX u.a.
-const SwCharFmts rArr = *m_rExport.pDoc-GetCharFmts(); // erst
CharFmt
+const SwCharFmts rArr = *m_rExport.pDoc-GetCharFmts(); // first
CharFmt
// das Default-ZeichenStyle ( 0 ) wird nicht mit ausgegeben !
for( sal_uInt16 n = 1; n rArr.size(); n++ )
{
@@ -283,7 +283,7 @@
pFmtA[ BuildGetSlot( *pFmt ) ] = pFmt;
}
-const SwTxtFmtColls rArr2 = *m_rExport.pDoc-GetTxtFmtColls(); // dann
TxtFmtColls
+const SwTxtFmtColls rArr2 = *m_rExport.pDoc-GetTxtFmtColls(); // then
TxtFmtColls
// das Default-TextStyle ( 0 ) wird nicht mit ausgegeben !
for( sal_uInt16 n = 1; n rArr2.size(); n++ )
{
@@ -296,20 +296,20 @@
static void impl_SkipOdd( ww::bytes* pO, sal_Size nTableStrmTell )
{
if ( ( nTableStrmTell + pO-size() ) 1 ) // Start auf gerader
-pO-push_back( (sal_uInt8)0 ); // Adresse
+pO-push_back( (sal_uInt8)0 ); // Adress
}
void WW8AttributeOutput::EndStyle()
{
impl_SkipOdd( m_rWW8Export.pO, m_rWW8Export.pTableStrm-Tell() );
-short nLen = m_rWW8Export.pO-size() - 2;// Laenge des Styles
+short nLen = m_rWW8Export.pO-size() - 2;// lenght of the
styles
sal_uInt8* p = m_rWW8Export.pO-front() + nPOPosStdLen1;
ShortToSVBT16( nLen, p ); // nachtragen
p = m_rWW8Export.pO-front() + nPOPosStdLen2;
ShortToSVBT16( nLen, p ); // dito
-m_rWW8Export.pTableStrm-Write( m_rWW8Export.pO-data(),
m_rWW8Export.pO-size() ); // ins File damit
+m_rWW8Export.pTableStrm-Write( m_rWW8Export.pO-data(),
m_rWW8Export.pO-size() ); // write it into the file
m_rWW8Export.pO-clear();
}
@@ -346,7 +346,7 @@
sal_uInt16 nLen = static_cast sal_uInt16 ( ( pData - aWW8_STD ) + 1 +
-((m_rWW8Export.bWrtWW8 ? 2 : 1 ) * (rName.Len() + 1)) ); //
vorlaeufig
+
[PATCH] Delete double condition check
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2453
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/2453/1
Delete double condition check
We don't need to check if aNextPostIt != aVisiblePostItList.end()
because we can't enter the enclosing if-statement when
aNextPostIt != aVisiblePostItList.end()
Change-Id: I853ed465e957bd26dae8312d2ce717ea1ca0b4e8
---
M sw/source/ui/docvw/PostItMgr.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 8d7148c..4dc6ab4 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -968,7 +968,7 @@
SwSidebarWin_iterator aNextPostIt = i;
++aNextPostIt;
-if (aNextPostIt !=aVisiblePostItList.end())
+if (aNextPostIt != aVisiblePostItList.end())
{
lTranslatePos = ( (*i)-VirtualPos().Y() +
(*i)-VirtualSize().Height()) - (*aNextPostIt)-VirtualPos().Y();
if (lTranslatePos 0) // note windows overlaps the next
one
@@ -1020,7 +1020,7 @@
}
}
}
-if (aNextPostIt !=aVisiblePostItList.end()
(*aNextPostIt)-IsFollow())
+if ( (*aNextPostIt)-IsFollow() )
lSpaceUsed += (*i)-VirtualSize().Height() +
ANCHORLINE_WIDTH;
else
lSpaceUsed += (*i)-VirtualSize().Height() +
GetSpaceBetween();
--
To view, visit https://gerrit.libreoffice.org/2453
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I853ed465e957bd26dae8312d2ce717ea1ca0b4e8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] resolve fdo#54335 type an existing style name into Style box...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2440
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/2440/1
resolve fdo#54335 type an existing style name into Style box changes hierarchy
Change-Id: If2fd4eecec4f6f031b264a9a1b0c31e938194878
Reviewed-on: https://gerrit.libreoffice.org/2292
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
---
M svx/source/tbxctrls/tbcontrl.cxx
1 file changed, 30 insertions(+), 10 deletions(-)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index fab0466..45a8f06 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -371,20 +371,20 @@
if ( !IsTravelSelect() )
{
-String aSelEntry( GetText() );
+OUString aSearchEntry( GetText() );
bool bDoIt = true, bClear = false;
if( bInSpecialMode )
{
-if( aSelEntry == aClearFormatKey GetSelectEntryPos() == 0 )
+if( aSearchEntry == aClearFormatKey GetSelectEntryPos() == 0 )
{
-aSelEntry = sDefaultStyle;
+aSearchEntry = sDefaultStyle;
bClear = true;
//not only apply default style but also call 'ClearFormatting'
Sequence PropertyValue aEmptyVals;
-SfxToolBoxControl::Dispatch( m_xDispatchProvider,
rtl::OUString(.uno:ResetAttributes),
+SfxToolBoxControl::Dispatch( m_xDispatchProvider,
OUString(.uno:ResetAttributes),
aEmptyVals);
}
-else if( aSelEntry == aMoreKey GetSelectEntryPos() == (
GetEntryCount() - 1 ) )
+else if( aSearchEntry == aMoreKey GetSelectEntryPos() == (
GetEntryCount() - 1 ) )
{
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
DBG_ASSERT( pViewFrm, SvxStyleBox_Impl::Select(): no
viewframe );
@@ -401,8 +401,28 @@
}
}
-// #i36723# after ReleaseFocus() the new entry is included into the
List
-sal_Bool bCreateNew = GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND;
+//Do we need to create a new style?
+SfxObjectShell *pShell = SfxObjectShell::Current();
+SfxStyleSheetBasePool* pPool = pShell-GetStyleSheetPool();
+SfxStyleSheetBase* pStyle = NULL;
+
+bool bCreateNew = 0;
+
+if ( pPool )
+{
+pPool-SetSearchMask( eStyleFamily, SFXSTYLEBIT_ALL );
+
+pStyle = pPool-First();
+while ( pStyle OUString( pStyle-GetName() ) != aSearchEntry )
+pStyle = pPool-Next();
+}
+
+if ( !pStyle )
+{
+// cannot find the style for whatever reason
+// therefore create a new style
+bCreateNew = 1;
+}
/* #i33380# DR 2004-09-03 Moved the following line above the
Dispatch() call.
This instance may be deleted in the meantime (i.e. when a dialog
is opened
@@ -412,17 +432,17 @@
if( bDoIt )
{
if ( bClear )
-SetText( aSelEntry );
+SetText( aSearchEntry );
SaveValue();
Sequence PropertyValue aArgs( 2 );
-aArgs[0].Value = makeAny( OUString( aSelEntry ) );
+aArgs[0].Value = makeAny( OUString( aSearchEntry ) );
aArgs[1].Name = OUString(Family);
aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
if( bCreateNew )
{
aArgs[0].Name = OUString(Param);
-SfxToolBoxControl::Dispatch( m_xDispatchProvider,
rtl::OUString(.uno:StyleNewByExample), aArgs);
+SfxToolBoxControl::Dispatch( m_xDispatchProvider,
OUString(.uno:StyleNewByExample), aArgs);
}
else
{
--
To view, visit https://gerrit.libreoffice.org/2440
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2fd4eecec4f6f031b264a9a1b0c31e938194878
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Add findbar close icons to other icon-themes as well
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2127 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/2127/1 Add findbar close icons to other icon-themes as well So far I only add an icon to the galaxy theme. Therefore I add now the other icons on the other themes as well. Change-Id: Id852d1adb87c31ee45187a0a7b4bfead56c7b19f --- A icon-themes/crystal/cmd/lc_exitsearch.png A icon-themes/crystal/cmd/sc_exitsearch.png A icon-themes/galaxy/cmd/sc_exitsearch.png A icon-themes/hicontrast/cmd/lc_exitsearch.png A icon-themes/hicontrast/cmd/sc_exitsearch.png A icon-themes/human/cmd/lc_exitsearch.png A icon-themes/human/cmd/sc_exitsearch.png A icon-themes/industrial/cmd/lc_exitsearch.png A icon-themes/industrial/cmd/sc_exitsearch.png A icon-themes/oxygen/cmd/lc_exitsearch.png A icon-themes/oxygen/cmd/sc_exitsearch.png A icon-themes/tango/cmd/lc_exitsearch.png A icon-themes/tango/cmd/sc_exitsearch.png 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icon-themes/crystal/cmd/lc_exitsearch.png b/icon-themes/crystal/cmd/lc_exitsearch.png new file mode 100644 index 000..38d7e4e --- /dev/null +++ b/icon-themes/crystal/cmd/lc_exitsearch.png Binary files differ diff --git a/icon-themes/crystal/cmd/sc_exitsearch.png b/icon-themes/crystal/cmd/sc_exitsearch.png new file mode 100644 index 000..853548d --- /dev/null +++ b/icon-themes/crystal/cmd/sc_exitsearch.png Binary files differ diff --git a/icon-themes/galaxy/cmd/sc_exitsearch.png b/icon-themes/galaxy/cmd/sc_exitsearch.png new file mode 100644 index 000..0030208 --- /dev/null +++ b/icon-themes/galaxy/cmd/sc_exitsearch.png Binary files differ diff --git a/icon-themes/hicontrast/cmd/lc_exitsearch.png b/icon-themes/hicontrast/cmd/lc_exitsearch.png new file mode 100644 index 000..3d54090 --- /dev/null +++ b/icon-themes/hicontrast/cmd/lc_exitsearch.png Binary files differ diff --git a/icon-themes/hicontrast/cmd/sc_exitsearch.png b/icon-themes/hicontrast/cmd/sc_exitsearch.png new file mode 100644 index 000..deedf75 --- /dev/null +++ b/icon-themes/hicontrast/cmd/sc_exitsearch.png Binary files differ diff --git a/icon-themes/human/cmd/lc_exitsearch.png b/icon-themes/human/cmd/lc_exitsearch.png new file mode 100644 index 000..f795224 --- /dev/null +++ b/icon-themes/human/cmd/lc_exitsearch.png Binary files differ diff --git a/icon-themes/human/cmd/sc_exitsearch.png b/icon-themes/human/cmd/sc_exitsearch.png new file mode 100644 index 000..2fdc737 --- /dev/null +++ b/icon-themes/human/cmd/sc_exitsearch.png Binary files differ diff --git a/icon-themes/industrial/cmd/lc_exitsearch.png b/icon-themes/industrial/cmd/lc_exitsearch.png new file mode 100644 index 000..98b099d --- /dev/null +++ b/icon-themes/industrial/cmd/lc_exitsearch.png Binary files differ diff --git a/icon-themes/industrial/cmd/sc_exitsearch.png b/icon-themes/industrial/cmd/sc_exitsearch.png new file mode 100644 index 000..a2f58e9 --- /dev/null +++ b/icon-themes/industrial/cmd/sc_exitsearch.png Binary files differ diff --git a/icon-themes/oxygen/cmd/lc_exitsearch.png b/icon-themes/oxygen/cmd/lc_exitsearch.png new file mode 100644 index 000..ed5f8b2 --- /dev/null +++ b/icon-themes/oxygen/cmd/lc_exitsearch.png Binary files differ diff --git a/icon-themes/oxygen/cmd/sc_exitsearch.png b/icon-themes/oxygen/cmd/sc_exitsearch.png new file mode 100644 index 000..4839c61 --- /dev/null +++ b/icon-themes/oxygen/cmd/sc_exitsearch.png Binary files differ diff --git a/icon-themes/tango/cmd/lc_exitsearch.png b/icon-themes/tango/cmd/lc_exitsearch.png new file mode 100644 index 000..18958f3 --- /dev/null +++ b/icon-themes/tango/cmd/lc_exitsearch.png Binary files differ diff --git a/icon-themes/tango/cmd/sc_exitsearch.png b/icon-themes/tango/cmd/sc_exitsearch.png new file mode 100644 index 000..0030208 --- /dev/null +++ b/icon-themes/tango/cmd/sc_exitsearch.png Binary files differ -- To view, visit https://gerrit.libreoffice.org/2127 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id852d1adb87c31ee45187a0a7b4bfead56c7b19f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add 6 width border to toplevel widgets of printdialog
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2067 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/2067/1 add 6 width border to toplevel widgets of printdialog Change-Id: I415769aeda335d65a4a5dc03be56e26a860046e3 --- M vcl/uiconfig/ui/printdialog.ui 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 227063e..a49737e 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -190,6 +190,7 @@ object class=GtkBox id=box3 property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=orientationvertical/property child object class=GtkFrame id=frame1 @@ -910,6 +911,7 @@ object class=GtkBox id=customcontents property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=orientationvertical/property child placeholder/ @@ -934,6 +936,7 @@ object class=GtkBox id=box9 property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=orientationvertical/property child object class=GtkFrame id=frame5 @@ -1368,6 +1371,7 @@ object class=GtkFrame id=frame6 property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=label_xalign0/property property name=shadow_typenone/property child -- To view, visit https://gerrit.libreoffice.org/2067 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I415769aeda335d65a4a5dc03be56e26a860046e3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] resolve fdo#60450 - Printer list is missing its border in Pr...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2042 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2042/1 resolve fdo#60450 - Printer list is missing its border in Print dialog Change-Id: I756788a003d4c57612c1752f1b47de27aaf683f2 --- M vcl/uiconfig/ui/printdialog.ui 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 22e759c..9106926 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -343,6 +343,7 @@ property name=height_request100/property property name=visibleTrue/property property name=can_focusTrue/property +property name=border_width10/property child internal-child=selection object class=GtkTreeSelection id=treeview-selection/ /child -- To view, visit https://gerrit.libreoffice.org/2042 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I756788a003d4c57612c1752f1b47de27aaf683f2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] resolve fdo#60450 - Printer list is missing its border in Pr...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2043
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2043/1
resolve fdo#60450 - Printer list is missing its border in Print dialog
Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
---
M vcl/source/window/builder.cxx
M vcl/uiconfig/ui/printdialog.ui
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 98091a3..7ea7a85 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1031,7 +1031,16 @@
// everything over to SvTreeViewBox
//d) remove the users of makeSvTreeViewBox
extractModel(id, rMap);
-WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+WinBits nWinStyle;
+OString sBorder = extractCustomProperty(rMap);
+if (sBorder.isEmpty())
+{
+nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+}
+else
+{
+nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_BORDER;
+}
//ListBox manages its own scrolling,
Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
pWindow = new ListBox(pRealParent, nWinStyle);
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 9106926..ec3d81a 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -339,7 +339,7 @@
/packing
/child
child
- object class=GtkTreeView id=printers
+ object class=GtkTreeView
id=printers:border
property
name=height_request100/property
property name=visibleTrue/property
property name=can_focusTrue/property
@@ -363,6 +363,7 @@
object class=GtkLabel id=label5
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=margin_top6/property
property name=label
translatable=yesPrinter/property
attributes
attribute name=weight value=bold/
--
To view, visit https://gerrit.libreoffice.org/2043
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Move close button to most left of the findbar
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2025 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/2025/1 Move close button to most left of the findbar I had a conversation with some UX-members, they all agree the close button needs to be on the far most left of the findbar. Change-Id: I3c13df4821f3f4f86fec02fa5427b2277fa10c19 --- M basctl/uiconfig/basicide/toolbar/findbar.xml M sc/uiconfig/scalc/toolbar/findbar.xml M sd/uiconfig/sdraw/toolbar/findbar.xml M sd/uiconfig/simpress/toolbar/findbar.xml M sw/uiconfig/sglobal/toolbar/findbar.xml M sw/uiconfig/sweb/toolbar/findbar.xml M sw/uiconfig/swriter/toolbar/findbar.xml M sw/uiconfig/swxform/toolbar/findbar.xml 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml index 5de9e66..42baa21 100644 --- a/basctl/uiconfig/basicide/toolbar/findbar.xml +++ b/basctl/uiconfig/basicide/toolbar/findbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ - toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml b/sc/uiconfig/scalc/toolbar/findbar.xml index 7bf51e7..a0e6037 100644 --- a/sc/uiconfig/scalc/toolbar/findbar.xml +++ b/sc/uiconfig/scalc/toolbar/findbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ - toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml index 7bf51e7..a0e6037 100644 --- a/sd/uiconfig/sdraw/toolbar/findbar.xml +++ b/sd/uiconfig/sdraw/toolbar/findbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ - toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml index 7bf51e7..a0e6037 100644 --- a/sd/uiconfig/simpress/toolbar/findbar.xml +++ b/sd/uiconfig/simpress/toolbar/findbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ - toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sglobal/toolbar/findbar.xml b/sw/uiconfig/sglobal/toolbar/findbar.xml index 7bf51e7..a0e6037 100644 --- a/sw/uiconfig/sglobal/toolbar/findbar.xml +++ b/sw/uiconfig/sglobal/toolbar/findbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ - toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sweb/toolbar/findbar.xml b/sw/uiconfig/sweb/toolbar/findbar.xml index 7bf51e7..a0e6037 100644 --- a/sw/uiconfig/sweb/toolbar/findbar.xml +++ b/sw/uiconfig/sweb/toolbar/findbar.xml @@ -18,10 +18,10 @@ * the License at
[PATCH] resolve fdo#60379 Impress Remote: Options look disabled
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2029 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/2029/1 resolve fdo#60379 Impress Remote: Options look disabled Change-Id: Ifb760fd0a0fa1430b77838a0340cc0956a0201a7 --- M android/sdremote/res/values/styles.xml 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index 80a4b4a..c88c947 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -72,9 +72,9 @@ item name=android:actionDropDownStyle@style/Theme.ImpressRemote.ActionBarMenu/item item name=android:windowBackground@color/light_grey/item item name=android:homeAsUpIndicator@drawable/up_indicator_white/item -item name=android:textColor@color/text_grey/item +item name=android:textColor@color/light_grey/item item name=android:alertDialogStyle@style/Theme.ImpressRemote.Dialog/item /style -/resources \ No newline at end of file +/resources -- To view, visit https://gerrit.libreoffice.org/2029 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb760fd0a0fa1430b77838a0340cc0956a0201a7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] resolve fdo#60379 Impress Remote: Options look disabled
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2030 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/2030/1 resolve fdo#60379 Impress Remote: Options look disabled Change-Id: Ifb760fd0a0fa1430b77838a0340cc0956a0201a7 Reviewed-on: https://gerrit.libreoffice.org/2029 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com --- M android/sdremote/res/values/styles.xml 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index 80a4b4a..c88c947 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -72,9 +72,9 @@ item name=android:actionDropDownStyle@style/Theme.ImpressRemote.ActionBarMenu/item item name=android:windowBackground@color/light_grey/item item name=android:homeAsUpIndicator@drawable/up_indicator_white/item -item name=android:textColor@color/text_grey/item +item name=android:textColor@color/light_grey/item item name=android:alertDialogStyle@style/Theme.ImpressRemote.Dialog/item /style -/resources \ No newline at end of file +/resources -- To view, visit https://gerrit.libreoffice.org/2030 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb760fd0a0fa1430b77838a0340cc0956a0201a7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] delete double entry (see line 345)
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1956
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/1956/1
delete double entry (see line 345)
Change-Id: I5be1d34ae5de4e9e2b49b97dc161d2ba06204cd5
---
M svx/source/dialog/ucsubset.src
1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
index 3ecc327..5bf5d36 100644
--- a/svx/source/dialog/ucsubset.src
+++ b/svx/source/dialog/ucsubset.src
@@ -866,10 +866,6 @@
{
Text [ en-US ] = Alchemical Symbols;
};
-String RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D
-{
-Text [ en-US ] = CJK Unified Ideographs Extension D;
-};
String RID_SUBSETSTR_ARABIC_EXTENDED_A
{
Text [ en-US ] = Arabic Extended-A;
--
To view, visit https://gerrit.libreoffice.org/1956
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5be1d34ae5de4e9e2b49b97dc161d2ba06204cd5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix if statement and translate German OSL_ENSURE
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1960
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/1960/1
fix if statement and translate German OSL_ENSURE
Change-Id: I3eefa563e00e6a4dcb3f1e5726bdf6d27f536624
---
M sw/source/core/txtnode/ndtxt.cxx
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index ab4cd3c..703e632 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1071,10 +1071,9 @@
{
SetAttrListLevel(nNewLevel);
}
-
+if (pDoc)
{
-if (pDoc)
-pDoc-GetNodes().UpdateOutlineNode(*this);
+pDoc-GetNodes().UpdateOutlineNode(*this);
}
@@ -3575,9 +3574,9 @@
SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
{
-OSL_ENSURE( pNewColl,ChgFmtColl: Collectionpointer ist 0. );
+OSL_ENSURE( pNewColl,ChgFmtColl: Collectionpointer has value 0. );
OSL_ENSURE( HAS_BASE( SwTxtFmtColl, pNewColl ),
-ChgFmtColl: ist kein Text-Collectionpointer. );
+ChgFmtColl: is not a Text Collection pointer. );
SwTxtFmtColl *pOldColl = GetTxtColl();
if( pNewColl != pOldColl )
--
To view, visit https://gerrit.libreoffice.org/1960
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eefa563e00e6a4dcb3f1e5726bdf6d27f536624
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: delete unused strings
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1955
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/1955/1
delete unused strings
Change-Id: Ic24e0453786d64b8c082c4d7ca4a22b853827d0e
---
M fpicker/source/office/OfficeFilePicker.hrc
M fpicker/source/office/iodlg.src
2 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/fpicker/source/office/OfficeFilePicker.hrc
b/fpicker/source/office/OfficeFilePicker.hrc
index 63a56a0..2a9cf8a 100644
--- a/fpicker/source/office/OfficeFilePicker.hrc
+++ b/fpicker/source/office/OfficeFilePicker.hrc
@@ -36,10 +36,8 @@
#define RID_FILEPICKER_IMAGES (RID_FPICKER_START+17)
#define STR_SVT_NEW_FOLDER (RID_FPICKER_START+19)
-#define RID_FILEOPEN_INVALIDFOLDER (RID_FPICKER_START+23)
#define RID_FILEOPEN_NOTEXISTENTFILE(RID_FPICKER_START+24)
#define STR_SVT_NOREMOVABLEDEVICE (RID_FPICKER_START+25)
-#define STR_SVT_ALLFORMATS (RID_FPICKER_START+26)
#endif
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 75feb9c..7747ae3 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -283,11 +283,6 @@
// strings ***
-String RID_FILEOPEN_INVALIDFOLDER
-{
-Text [ en-US ] = $name$ does not exist.;
-};
-
String RID_FILEOPEN_NOTEXISTENTFILE
{
Text [ en-US ] = The file $name$ does not exist.\nMake sure you have
entered the correct file name.;
@@ -311,11 +306,6 @@
String STR_SVT_NOREMOVABLEDEVICE
{
Text [ en-US ] = No removable storage device detected.\nMake sure it is
plugged in properly and try again. ;
-};
-
-String STR_SVT_ALLFORMATS
-{
-Text [ en-US ] = All Formats ;
};
// EOF
--
To view, visit https://gerrit.libreoffice.org/1955
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic24e0453786d64b8c082c4d7ca4a22b853827d0e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] resolve fdo#59619 Spelling error - heigth
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1782 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/1782/1 resolve fdo#59619 Spelling error - heigth Change-Id: Ice59129d20c6b7e3aa0dbabfefabd14bad8199b6 --- M svx/uiconfig/ui/compressgraphicdialog.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui index 59b85b5..aff8431 100644 --- a/svx/uiconfig/ui/compressgraphicdialog.ui +++ b/svx/uiconfig/ui/compressgraphicdialog.ui @@ -322,7 +322,7 @@ property name=can_focusFalse/property property name=margin_left20/property property name=xalign0/property -property name=label translatable=yesHeigth:/property +property name=label translatable=yesHeight:/property property name=width_chars15/property /object packing -- To view, visit https://gerrit.libreoffice.org/1782 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice59129d20c6b7e3aa0dbabfefabd14bad8199b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: resolve fdo#59619 Spelling error - heigth
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1783 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/1783/1 resolve fdo#59619 Spelling error - heigth Change-Id: Ice59129d20c6b7e3aa0dbabfefabd14bad8199b6 --- M svx/uiconfig/ui/compressgraphicdialog.ui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui index 59b85b5..aff8431 100644 --- a/svx/uiconfig/ui/compressgraphicdialog.ui +++ b/svx/uiconfig/ui/compressgraphicdialog.ui @@ -322,7 +322,7 @@ property name=can_focusFalse/property property name=margin_left20/property property name=xalign0/property -property name=label translatable=yesHeigth:/property +property name=label translatable=yesHeight:/property property name=width_chars15/property /object packing -- To view, visit https://gerrit.libreoffice.org/1783 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice59129d20c6b7e3aa0dbabfefabd14bad8199b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] resolve fdo#59240 - FORMATTING: Thai number shown as Arabic ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1769 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/1769/1 resolve fdo#59240 - FORMATTING: Thai number shown as Arabic numerals Change-Id: I6123f8924d7502d3b97b3254ce4e5df724e4370d --- M svl/source/numbers/zformat.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 01f38a2..9709110 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -5282,7 +5282,7 @@ com::sun::star::lang::Locale aLocale( LanguageTag( rNum.GetLang() ).getLocale() ); OUString sTemp(rStr.makeStringAndClear()); -GetFormatter().GetNatNum()-getNativeNumberString( sTemp, aLocale, rNum.GetNatNum() ); +sTemp = GetFormatter().GetNatNum()-getNativeNumberString( sTemp, aLocale, rNum.GetNatNum() ); rStr.append(sTemp); } -- To view, visit https://gerrit.libreoffice.org/1769 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6123f8924d7502d3b97b3254ce4e5df724e4370d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: resolve fdo#59240 - FORMATTING: Thai number shown as Arabic ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1770 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1770/1 resolve fdo#59240 - FORMATTING: Thai number shown as Arabic numerals Change-Id: Ia0d1089d90a6b2196d45da63afbb7d8fa80e4658 --- M svl/source/numbers/zformat.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 01f38a2..9709110 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -5282,7 +5282,7 @@ com::sun::star::lang::Locale aLocale( LanguageTag( rNum.GetLang() ).getLocale() ); OUString sTemp(rStr.makeStringAndClear()); -GetFormatter().GetNatNum()-getNativeNumberString( sTemp, aLocale, rNum.GetNatNum() ); +sTemp = GetFormatter().GetNatNum()-getNativeNumberString( sTemp, aLocale, rNum.GetNatNum() ); rStr.append(sTemp); } -- To view, visit https://gerrit.libreoffice.org/1770 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0d1089d90a6b2196d45da63afbb7d8fa80e4658 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Add close findbar button also on other LO components
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1759 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/1759/1 Add close findbar button also on other LO components Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 Reviewed-on: https://gerrit.libreoffice.org/1727 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com --- M basctl/uiconfig/basicide/toolbar/findbar.xml M sc/uiconfig/scalc/toolbar/findbar.xml M sd/uiconfig/sdraw/toolbar/findbar.xml M sd/uiconfig/simpress/toolbar/findbar.xml M sw/uiconfig/sglobal/toolbar/findbar.xml M sw/uiconfig/sweb/toolbar/findbar.xml M sw/uiconfig/swxform/toolbar/findbar.xml 7 files changed, 7 insertions(+), 0 deletions(-) diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml index d8f02d1..5de9e66 100644 --- a/basctl/uiconfig/basicide/toolbar/findbar.xml +++ b/basctl/uiconfig/basicide/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml b/sc/uiconfig/scalc/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sc/uiconfig/scalc/toolbar/findbar.xml +++ b/sc/uiconfig/scalc/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sd/uiconfig/sdraw/toolbar/findbar.xml +++ b/sd/uiconfig/sdraw/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sd/uiconfig/simpress/toolbar/findbar.xml +++ b/sd/uiconfig/simpress/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sglobal/toolbar/findbar.xml b/sw/uiconfig/sglobal/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/sglobal/toolbar/findbar.xml +++ b/sw/uiconfig/sglobal/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sweb/toolbar/findbar.xml b/sw/uiconfig/sweb/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/sweb/toolbar/findbar.xml +++ b/sw/uiconfig/sweb/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/swxform/toolbar/findbar.xml b/sw/uiconfig/swxform/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/swxform/toolbar/findbar.xml +++ b/sw/uiconfig/swxform/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar -- To view, visit https://gerrit.libreoffice.org/1759 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list
[PATCH] Change in core[libreoffice-4-0]: add close option to findbar in Writer
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1758
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/1758/1
add close option to findbar in Writer
Change-Id: Ie42da7ecc7f3cb59bb6f1fb798e72a6862eb1f67
Reviewed-on: https://gerrit.libreoffice.org/1557
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
---
A icon-themes/galaxy/cmd/lc_exitsearch.png
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
M svx/inc/tbunosearchcontrollers.hxx
M svx/source/tbxctrls/tbunosearchcontrollers.cxx
M svx/source/unodraw/unoctabl.cxx
M svx/util/svx.component
M sw/uiconfig/swriter/toolbar/findbar.xml
8 files changed, 195 insertions(+), 2 deletions(-)
diff --git a/icon-themes/galaxy/cmd/lc_exitsearch.png
b/icon-themes/galaxy/cmd/lc_exitsearch.png
new file mode 100644
index 000..18958f3
--- /dev/null
+++ b/icon-themes/galaxy/cmd/lc_exitsearch.png
Binary files differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index a60dd09..fe27c05 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -396,6 +396,17 @@
valuecom.sun.star.svx.DownSearchToolboxController/value
/prop
/node
+ node oor:name=com.sun.star.svx.ExitFindbarToolboxController
oor:op=replace
+prop oor:name=Command
+ value.uno:ExitSearch/value
+/prop
+prop oor:name=Module
+ value/
+/prop
+prop oor:name=Controller
+ valuecom.sun.star.svx.ExitFindbarToolboxController/value
+/prop
+ /node
node oor:name=com.sun.star.svx.UpSearchToolboxController
oor:op=replace
prop oor:name=Command
value.uno:UpSearch/value
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index b8973b0..ac67696 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1471,6 +1471,14 @@
value1/value
/prop
/node
+node oor:name=.uno:ExitSearch oor:op=replace
+prop oor:name=Label oor:type=xs:string
+value xml:lang=en-USExit Search/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+/node
node oor:name=vnd.sun.star.findbar:FocusToFindbar
oor:op=replace
prop oor:name=Label oor:type=xs:string
value xml:lang=en-US~Find.../value
diff --git a/svx/inc/tbunosearchcontrollers.hxx
b/svx/inc/tbunosearchcontrollers.hxx
index 47a1d00..87f9756 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -135,6 +135,48 @@
};
+class ExitSearchToolboxController : public svt::ToolboxController,
+ public css::lang::XServiceInfo
+{
+public:
+enum Type { EXIT };
+
+ExitSearchToolboxController( const css::uno::Reference
css::lang::XMultiServiceFactory rServiceManager, Type eType );
+~ExitSearchToolboxController();
+
+// XInterface
+virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
css::uno::Type aType ) throw ( css::uno::RuntimeException );
+virtual void SAL_CALL acquire() throw ();
+virtual void SAL_CALL release() throw ();
+
+// XServiceInfo
+virtual ::rtl::OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
ServiceName ) throw( css::uno::RuntimeException );
+virtual css::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+static ::rtl::OUString getImplementationName_Static( ) throw()
+{
+return ::rtl::OUString(
com.sun.star.svx.ExitFindbarToolboxController );
+}
+
+static css::uno::Sequence ::rtl::OUString
getSupportedServiceNames_Static() throw();
+
+// XComponent
+virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence css::uno::Any
aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException);
+
+// XToolbarController
+virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (
css::uno::RuntimeException );
+
+// XStatusListener
+virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent
rEvent ) throw ( css::uno::RuntimeException );
+
+private:
+Type meType;
+};
+
Change in core[libreoffice-4-0]: add close option to findbar in Writer
Joren De Cuyper has abandoned this change. Change subject: add close option to findbar in Writer .. Patch Set 1: Abandoned Sorry, didn't know about string freeze -- To view, visit https://gerrit.libreoffice.org/1758 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie42da7ecc7f3cb59bb6f1fb798e72a6862eb1f67 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Add close findbar button also on other LO components
Joren De Cuyper has abandoned this change. Change subject: Add close findbar button also on other LO components .. Patch Set 1: Abandoned related to abandoned change because of string freeze -- To view, visit https://gerrit.libreoffice.org/1759 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#46718 Delete multiple styles at once
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1737
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/1737/1
fdo#46718 Delete multiple styles at once
Change-Id: I5f5982b2a2768d021f24693a285274544e07e40f
---
M sfx2/source/dialog/templdlg.cxx
1 file changed, 49 insertions(+), 18 deletions(-)
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b315453..8831f3e 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -911,6 +911,7 @@
aFilterLb.SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl,
FilterSelectHdl ) );
aFmtLb.SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl,
ApplyHdl ) );
aFmtLb.SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl,
FmtSelectHdl ) );
+aFmtLb.SetSelectionMode(MULTIPLE_SELECTION);
aFilterLb.Show();
aFmtLb.Show();
@@ -1046,7 +1047,7 @@
{
aFmtLb.MakeVisible( pEntry );
aFmtLb.Select( pEntry );
-bWaterDisabled = !HasSelectedStyle();
+bWaterDisabled = (aFmtLb.GetSelectionCount() =1 ? sal_False :
sal_True);
FmtSelectHdl( NULL );
}
}
@@ -1306,7 +1307,8 @@
bWaterDisabled = pItem == 0;
if(!bWaterDisabled)
-bWaterDisabled = !HasSelectedStyle();
+//make sure the watercan is only activated when there is (only) one
selection
+bWaterDisabled = (aFmtLb.GetSelectionCount() =1 ? sal_False :
sal_True);
if(pItem !bWaterDisabled)
{
@@ -1644,6 +1646,7 @@
aUpdName.SetValue(aTemplName);
pItems[ nCount++ ] = aUpdName;
}
+
if ( rRefStr.Len() )
pItems[ nCount++ ] = aRefName;
@@ -1660,7 +1663,7 @@
if ( !pItem || aDeleted )
return sal_False;
-if ( nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId )
+if ( (nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId)
(aFmtLb.GetSelectionCount() = 1) )
{
SfxUInt16Item *pFilterItem = PTR_CAST(SfxUInt16Item, pItem);
OSL_ENSURE(pFilterItem, SfxUINT16Item expected);
@@ -1899,7 +1902,7 @@
void SfxCommonTemplateDialog_Impl::NewHdl(void *)
{
String aEmpty;
-if ( nActFamily != 0x )
+if ( nActFamily != 0x (aFmtLb.GetSelectionCount() = 1))
{
Window* pTmp;
pTmp = Application::GetDefDialogParent();
@@ -1963,10 +1966,35 @@
{
if ( IsInitialized() HasSelectedStyle() )
{
-const String aTemplName( GetSelectedEntry() );
-SfxStyleSheetBase* pStyle = GetSelectedStyle();
-if ( pStyle )
+sal_uLong SelectionCount = 0;
+String aRet;
+
+SelectionCount = aFmtLb.GetSelectionCount();
+std::vectorSvTreeListEntry* aList;
+
+SvTreeListEntry* pEntry = aFmtLb.FirstSelected();
+
+while (pEntry)
{
+aList.push_back( pEntry );
+pEntry = aFmtLb.NextSelected( pEntry );
+SelectionCount++;
+}
+
+std::vectorSvTreeListEntry*::const_iterator it = aList.begin(),
itEnd = aList.end();
+
+for (; it != itEnd; ++it)
+{
+if (pTreeBox)
+aRet = pTreeBox-GetEntryText( *it );
+else
+aRet = aFmtLb.GetEntryText( *it );
+const String aTemplName( aRet );
+
+const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
+
+SfxStyleSheetBase* pStyle = pStyleSheetPool-Find( aTemplName,
pItem-GetFamily(), SFXSTYLEBIT_ALL );
+
String aMsg;
if ( pStyle-IsUsed() )
aMsg = SfxResId(STR_DELETE_STYLE_USED).toString();
@@ -1981,21 +2009,21 @@
{
PrepareDeleteAction();
-if ( pTreeBox ) // To prevent the Treelistbox to shut down
while
-// deleting.
-{
-bDontUpdate = sal_True;
-}
+bDontUpdate = sal_True; // To prevent the Treelistbox to shut
down while deleting
+
Execute_Impl( SID_STYLE_DELETE, aTemplName,
String(),
(sal_uInt16)GetFamilyItem_Impl()-GetFamily() );
if ( pTreeBox )
{
-pTreeBox-RemoveParentKeepChildren(
pTreeBox-FirstSelected() );
+pTreeBox-RemoveParentKeepChildren( *it );
bDontUpdate = sal_False;
}
}
+--SelectionCount;
}
+bDontUpdate = sal_False; //if everything is deleted set bDontUpdate
back to false
+UpdateStyles_Impl(UPDATE_FAMILY_LIST); //and force-update the list
}
}
@@ -2045,7 +2073,7 @@
const SfxStyleSheetBase *pStyle =
pStyleSheetPool-Find(aTemplName,eFam, pTreeBox? SFXSTYLEBIT_ALL :
nFilter);
-OSL_ENSURE(pStyle, Style ot found);
+OSL_ENSURE(pStyle,
fdo#59090 clean up memory leaks
Joren De Cuyper has abandoned this change. Change subject: fdo#59090 clean up memory leaks .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1569 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ifbade82383694ebac0e82920014cddfff5b12fcb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#59101 - [Feature Request] Make Find hotkey (Ctrl+F) a to...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1751
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1751/1
fdo#59101 - [Feature Request] Make Find hotkey (Ctrl+F) a toggle command
Change-Id: I8cf518a18e4846f9e687d05c7f7c0eb774abba6f
---
M svx/source/tbxctrls/tbunosearchcontrollers.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 0dff510..07ca9a6 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -138,7 +138,7 @@
sal_Bool bMod1 = pKeyEvent-GetKeyCode().IsMod1();
sal_uInt16 nCode = pKeyEvent-GetKeyCode().GetCode();
-if ( KEY_ESCAPE == nCode )
+if ( KEY_ESCAPE == nCode || (bMod1 (KEY_F == nCode)) )
{
nRet = 1;
GrabFocusToDocument();
--
To view, visit https://gerrit.libreoffice.org/1751
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cf518a18e4846f9e687d05c7f7c0eb774abba6f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Add close findbar button also on other LO components
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1727 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/1727/1 Add close findbar button also on other LO components Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 --- M basctl/uiconfig/basicide/toolbar/findbar.xml M sc/uiconfig/scalc/toolbar/findbar.xml M sd/uiconfig/sdraw/toolbar/findbar.xml M sd/uiconfig/simpress/toolbar/findbar.xml M sw/uiconfig/sglobal/toolbar/findbar.xml M sw/uiconfig/sweb/toolbar/findbar.xml M sw/uiconfig/swxform/toolbar/findbar.xml 7 files changed, 7 insertions(+), 0 deletions(-) diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml index d8f02d1..5de9e66 100644 --- a/basctl/uiconfig/basicide/toolbar/findbar.xml +++ b/basctl/uiconfig/basicide/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml b/sc/uiconfig/scalc/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sc/uiconfig/scalc/toolbar/findbar.xml +++ b/sc/uiconfig/scalc/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sd/uiconfig/sdraw/toolbar/findbar.xml +++ b/sd/uiconfig/sdraw/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sd/uiconfig/simpress/toolbar/findbar.xml +++ b/sd/uiconfig/simpress/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sglobal/toolbar/findbar.xml b/sw/uiconfig/sglobal/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/sglobal/toolbar/findbar.xml +++ b/sw/uiconfig/sglobal/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/sweb/toolbar/findbar.xml b/sw/uiconfig/sweb/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/sweb/toolbar/findbar.xml +++ b/sw/uiconfig/sweb/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar diff --git a/sw/uiconfig/swxform/toolbar/findbar.xml b/sw/uiconfig/swxform/toolbar/findbar.xml index cca79d9..7bf51e7 100644 --- a/sw/uiconfig/swxform/toolbar/findbar.xml +++ b/sw/uiconfig/swxform/toolbar/findbar.xml @@ -21,6 +21,7 @@ toolbar:toolbaritem xlink:href=.uno:FindText/ toolbar:toolbaritem xlink:href=.uno:DownSearch/ toolbar:toolbaritem xlink:href=.uno:UpSearch/ + toolbar:toolbaritem xlink:href=.uno:ExitSearch/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ /toolbar:toolbar -- To view, visit https://gerrit.libreoffice.org/1727 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a18d0459d9584d00b8d7c747b0bb500e02988d9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] delete style when pressing DEL + fix type
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1681
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/1681/1
delete style when pressing DEL + fix type
Change-Id: I6748aad9f9214bb9ef1ec84d35db731c756056a3
---
M sfx2/source/dialog/templdlg.cxx
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b315453..bdf794d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -312,7 +312,7 @@
const KeyCode rKeyCode = rNEvt.GetKeyEvent()-GetKeyCode();
if(!rKeyCode.GetModifier())
{
-if( pDialog-bCanDel KEY_DELETE == rKeyCode.GetCode())
+if( pDialog-bCanDel || KEY_DELETE == rKeyCode.GetCode())
{
pDialog-DeleteHdl( NULL );
nRet = 1;
@@ -324,7 +324,7 @@
}
}
}
-if(!nRet)
+if(nRet)
nRet = SvTreeListBox::Notify( rNEvt );
return nRet;
}
@@ -2045,7 +2045,7 @@
const SfxStyleSheetBase *pStyle =
pStyleSheetPool-Find(aTemplName,eFam, pTreeBox? SFXSTYLEBIT_ALL :
nFilter);
-OSL_ENSURE(pStyle, Style ot found);
+OSL_ENSURE(pStyle, Style not found);
if(pStyle pStyle-IsUserDefined())
{
EnableDel(sal_True);
--
To view, visit https://gerrit.libreoffice.org/1681
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6748aad9f9214bb9ef1ec84d35db731c756056a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
delete style when pressing DEL + fix type
Joren De Cuyper has abandoned this change. Change subject: delete style when pressing DEL + fix type .. Patch Set 1: Abandoned isn't a bug, my bad -- To view, visit https://gerrit.libreoffice.org/1681 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6748aad9f9214bb9ef1ec84d35db731c756056a3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] typo fix
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1563 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/1563/1 typo fix Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae --- M officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 4d11e48..50f76cf 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -259,7 +259,7 @@ /node node oor:name=H_MOD1 oor:op=replace install:module=unxwnt prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value - value xml:lang=en-US.uno.SearchDialog/value + value xml:lang=en-US.uno:SearchDialog/value /prop /node node oor:name=N_MOD1 oor:op=replace -- To view, visit https://gerrit.libreoffice.org/1563 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#59090 clean up memory leaks
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1569
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/1569/1
fdo#59090 clean up memory leaks
Change-Id: Ifbade82383694ebac0e82920014cddfff5b12fcb
---
M basic/source/classes/sb.cxx
M cui/source/options/optdict.cxx
M embeddedobj/source/commonembedding/xfactory.cxx
M embeddedobj/source/general/xcreator.cxx
M embeddedobj/source/msole/xdialogcreator.cxx
M extensions/source/propctrlr/defaultforminspection.cxx
M extensions/source/propctrlr/defaulthelpprovider.cxx
M forms/source/component/ComboBox.cxx
M forms/source/runtime/formoperations.cxx
M fpicker/source/office/OfficeFilePicker.cxx
M fpicker/source/office/OfficeFolderPicker.cxx
M package/source/zippackage/ZipPackage.cxx
M package/source/zippackage/zipfileaccess.cxx
M sc/source/ui/unoobj/servuno.cxx
M sfx2/source/appl/xpackcreator.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/objstor.cxx
M sfx2/source/doc/ownsubfilterservice.cxx
M sfx2/source/view/frmload.cxx
M starmath/source/smdetect.cxx
M stoc/source/javaloader/javaloader.cxx
M stoc/source/namingservice/namingservice.cxx
M stoc/test/testiadapter.cxx
M svl/source/fsstor/fsfactory.cxx
M svl/source/passwordcontainer/passwordcontainer.cxx
M svtools/source/hatchwindow/hatchwindowfactory.cxx
M svx/source/fmcomp/gridcell.cxx
M svx/source/sdr/contact/viewcontactofunocontrol.cxx
M svx/source/tbxctrls/extrusioncontrols.cxx
M svx/source/tbxctrls/fontworkgallery.cxx
M svx/source/tbxctrls/tbunocontroller.cxx
M svx/source/unodraw/unobtabl.cxx
M svx/source/unodraw/unoctabl.cxx
M svx/source/unodraw/unodtabl.cxx
M svx/source/unodraw/unogtabl.cxx
M svx/source/unodraw/unohtabl.cxx
M svx/source/unodraw/unomtabl.cxx
M svx/source/unodraw/unottabl.cxx
38 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 12cb5da..b75c47f 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1699,7 +1699,7 @@
// Implementation of the code for the string transport to SFX-Error
if( !rMsg.isEmpty() )
{
-code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
+code = (sal_uIntPtr) StringErrorInfo( code, rMsg );
}
SetErrorData( code, l, c1, c2 );
GetSbData()-bCompiler = true;
@@ -1743,11 +1743,11 @@
{
OUString aTmp = \' +
OUString::valueOf(SbxErrObject::getUnoErrObject()-getNumber()) +
\'\n + OUString(!GetSbData()-aErrMsg.isEmpty()
? GetSbData()-aErrMsg : rMsg);
-code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
+code = (sal_uIntPtr) StringErrorInfo( code, aTmp );
}
else
{
-code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
+code = (sal_uIntPtr) StringErrorInfo( code, rMsg );
}
}
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 9855c8a..32788c3 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -168,7 +168,7 @@
// error: couldn't create new dictionary
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, String(),
this, RID_SVXERRCTX, CUI_MGR() );
-ErrorHandler::HandleError( *new StringErrorInfo(
+ErrorHandler::HandleError( StringErrorInfo(
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
EndDialog( RET_CANCEL );
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx
b/embeddedobj/source/commonembedding/xfactory.cxx
index ec29eda..a8cd472 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -54,7 +54,7 @@
uno::Reference uno::XInterface SAL_CALL
OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance(
const uno::Reference lang::XMultiServiceFactory
xServiceManager )
{
-return uno::Reference uno::XInterface ( *new OOoEmbeddedObjectFactory(
xServiceManager ) );
+return uno::Reference uno::XInterface ( OOoEmbeddedObjectFactory(
xServiceManager ) );
}
//-
@@ -493,7 +493,7 @@
uno::Reference uno::XInterface SAL_CALL
OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance(
const uno::Reference lang::XMultiServiceFactory
xServiceManager )
{
-return uno::Reference uno::XInterface ( *new
OOoSpecialEmbeddedObjectFactory( xServiceManager ) );
+return uno::Reference uno::XInterface ( OOoSpecialEmbeddedObjectFactory(
xServiceManager ) );
}
//-
diff --git a/embeddedobj/source/general/xcreator.cxx
b/embeddedobj/source/general/xcreator.cxx
index 599fc7c..30def27 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -56,7 +56,7 @@
uno::Reference uno::XInterface SAL_CALL
[PATCH] add close option to findbar in Writer
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1557
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/1557/1
add close option to findbar in Writer
Change-Id: Ie42da7ecc7f3cb59bb6f1fb798e72a6862eb1f67
---
M dictionaries
A icon-themes/galaxy/cmd/lc_exitsearch.png
M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
M officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
M svx/inc/tbunosearchcontrollers.hxx
M svx/source/tbxctrls/tbunosearchcontrollers.cxx
M svx/source/unodraw/unoctabl.cxx
M svx/util/svx.component
M sw/uiconfig/swriter/toolbar/findbar.xml
9 files changed, 195 insertions(+), 2 deletions(-)
diff --git a/dictionaries b/dictionaries
index a844895..f0c914a 16
--- a/dictionaries
+++ b/dictionaries
-Subproject commit a84489515d2207b1c34646be7d6f532b84a37439
+Subproject commit f0c914a43e7e6540300da25c935a77aebb672094
diff --git a/icon-themes/galaxy/cmd/lc_exitsearch.png
b/icon-themes/galaxy/cmd/lc_exitsearch.png
new file mode 100644
index 000..18958f3
--- /dev/null
+++ b/icon-themes/galaxy/cmd/lc_exitsearch.png
Binary files differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index a60dd09..fe27c05 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -396,6 +396,17 @@
valuecom.sun.star.svx.DownSearchToolboxController/value
/prop
/node
+ node oor:name=com.sun.star.svx.ExitFindbarToolboxController
oor:op=replace
+prop oor:name=Command
+ value.uno:ExitSearch/value
+/prop
+prop oor:name=Module
+ value/
+/prop
+prop oor:name=Controller
+ valuecom.sun.star.svx.ExitFindbarToolboxController/value
+/prop
+ /node
node oor:name=com.sun.star.svx.UpSearchToolboxController
oor:op=replace
prop oor:name=Command
value.uno:UpSearch/value
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 42188b6..bbdf997 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1471,6 +1471,14 @@
value1/value
/prop
/node
+node oor:name=.uno:ExitSearch oor:op=replace
+prop oor:name=Label oor:type=xs:string
+value xml:lang=en-USExit Search/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+value1/value
+/prop
+/node
node oor:name=vnd.sun.star.findbar:FocusToFindbar
oor:op=replace
prop oor:name=Label oor:type=xs:string
value xml:lang=en-US~Find.../value
diff --git a/svx/inc/tbunosearchcontrollers.hxx
b/svx/inc/tbunosearchcontrollers.hxx
index 47a1d00..87f9756 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -135,6 +135,48 @@
};
+class ExitSearchToolboxController : public svt::ToolboxController,
+ public css::lang::XServiceInfo
+{
+public:
+enum Type { EXIT };
+
+ExitSearchToolboxController( const css::uno::Reference
css::lang::XMultiServiceFactory rServiceManager, Type eType );
+~ExitSearchToolboxController();
+
+// XInterface
+virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
css::uno::Type aType ) throw ( css::uno::RuntimeException );
+virtual void SAL_CALL acquire() throw ();
+virtual void SAL_CALL release() throw ();
+
+// XServiceInfo
+virtual ::rtl::OUString SAL_CALL getImplementationName() throw(
css::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
ServiceName ) throw( css::uno::RuntimeException );
+virtual css::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+static ::rtl::OUString getImplementationName_Static( ) throw()
+{
+return ::rtl::OUString(
com.sun.star.svx.ExitFindbarToolboxController );
+}
+
+static css::uno::Sequence ::rtl::OUString
getSupportedServiceNames_Static() throw();
+
+// XComponent
+virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence css::uno::Any
aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException);
+
+// XToolbarController
+virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (
css::uno::RuntimeException );
+
+// XStatusListener
+virtual void SAL_CALL statusChanged( const
[PATCH] remove some ::rtl:: prefixes
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1558
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/1558/1
remove some ::rtl:: prefixes
Change-Id: Ia31f1b5ae3c940861d72598aff54be85e2ad33dd
---
M accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
M accessibility/source/extended/textwindowaccessibility.cxx
M avmedia/source/quicktime/framegrabber.mm
M avmedia/source/quicktime/manager.mm
M avmedia/source/quicktime/player.mm
M avmedia/source/quicktime/quicktimeuno.mm
M avmedia/source/quicktime/window.mm
M avmedia/source/viewer/mediawindowbase_impl.cxx
M basctl/source/basicide/unomodel.cxx
M basctl/source/basicide/unomodel.hxx
M basegfx/test/basegfx2d.cxx
M bridges/source/jni_uno/jni_base.h
M bridges/source/jni_uno/jni_info.h
M bridges/test/testcomp.cxx
M bridges/test/testcomp.h
M canvas/source/cairo/cairo_canvashelper.cxx
M canvas/source/directx/dx_9rm.cxx
17 files changed, 130 insertions(+), 130 deletions(-)
diff --git
a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 6d8db68..02c5571 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -141,7 +141,7 @@
public ParagraphBase, private ::comphelper::OCommonAccessibleText
{
public:
-ParagraphImpl(::rtl::Reference Document const rDocument,
+ParagraphImpl(Reference Document const rDocument,
Paragraphs::size_type nNumber, ::osl::Mutex rMutex);
// Not thread-safe.
@@ -372,7 +372,7 @@
// Throws ::css::lang::DisposedException:
void checkDisposed();
-::rtl::Reference Document m_xDocument;
+Reference Document m_xDocument;
Paragraphs::size_type m_nNumber;
//::cppu::OInterfaceContainerHelper m_aListeners;
@@ -404,21 +404,21 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a ParagraphImpl const * instead of a
-// ::rtl::Reference ParagraphImpl const .
+// Reference ParagraphImpl const .
::sal_Int32 retrieveParagraphIndex(ParagraphImpl const * pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a ParagraphImpl const * instead of a
-// ::rtl::Reference ParagraphImpl const .
+// Reference ParagraphImpl const .
::sal_Int64 retrieveParagraphState(ParagraphImpl const * pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a ParagraphImpl const instead of a
-// ::rtl::Reference ParagraphImpl const .
+// Reference ParagraphImpl const .
::css::awt::Rectangle
retrieveParagraphBounds(ParagraphImpl const * pParagraph, bool bAbsolute);
@@ -426,14 +426,14 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a ParagraphImpl const instead of a
-// ::rtl::Reference ParagraphImpl const .
+// Reference ParagraphImpl const .
OUString retrieveParagraphText(ParagraphImpl const * pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a ParagraphImpl const instead of a
-// ::rtl::Reference ParagraphImpl const .
+// Reference ParagraphImpl const .
void retrieveParagraphSelection(ParagraphImpl const * pParagraph,
::sal_Int32 * pBegin, ::sal_Int32 * pEnd);
@@ -441,14 +441,14 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a ParagraphImpl const * instead of a
-// ::rtl::Reference ParagraphImpl const .
+// Reference ParagraphImpl const .
::sal_Int32 retrieveParagraphCaretPosition(ParagraphImpl const *
pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a ParagraphImpl const instead of a
-// ::rtl::Reference ParagraphImpl const .
+// Reference ParagraphImpl const .
// Throws
