[Libreoffice-commits] core.git: 2 commits - reportbuilder/Package_reportbuilder-templates.mk reportbuilder/template wizards/com
dev/null
|binary
reportbuilder/Package_reportbuilder-templates.mk|
2 -
reportbuilder/template/common/wizard/report/default.otr
|binary
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java |
14 ++
4 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 3a5024bc0fd4c30f06da350b5c56300368c582e8
Author: Csikós Tamás
Date: Mon Jul 1 12:28:21 2013 +0200
fdo#64155 - fix unlocalized 'default' list entry
Change-Id: I3a8b706fe855e7fbff71f227b167a51d3a465be0
diff --git
a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index 55615af..f80da12 100644
---
a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++
b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -55,6 +55,7 @@ import com.sun.star.wizards.report.IReportDocument;
import com.sun.star.wizards.report.ReportImplementationHelper;
import com.sun.star.wizards.report.ReportLayouter;
import com.sun.star.wizards.report.ReportWizard;
+import com.sun.star.wizards.ui.UIConsts;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -684,9 +685,22 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
break;
}
}
+exchangeLayoutTitlesWithLocalisedOnes(LayoutFiles);
return LayoutFiles;
}
+private void exchangeLayoutTitlesWithLocalisedOnes(String[][] LayoutFiles)
+{
+for(int i = 0; i < LayoutFiles[0].length; ++i)
+{
+if( LayoutFiles[0][i] == null) { break;}
+if( LayoutFiles[0][i].equals("default") )
+{
+LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT
+ 100);
+}
+}
+}
+
public XReportDefinition getReportDefinition()
{
if (m_reportDocument == null)
commit a1a592140f7492cfd169787fc3d0114804afccd7
Author: Andras Timar
Date: Tue Jul 2 03:00:08 2013 -0700
default report template should be language-independent
Change-Id: Ia0b18b90ffd2cb4c6958749e45d8cfec92825d02
diff --git a/reportbuilder/Package_reportbuilder-templates.mk
b/reportbuilder/Package_reportbuilder-templates.mk
index 54e6d7f..dec8473 100644
--- a/reportbuilder/Package_reportbuilder-templates.mk
+++ b/reportbuilder/Package_reportbuilder-templates.mk
@@ -17,7 +17,7 @@ $(eval $(call
gb_Package_Package,reportbuilder-templates,$(SRCDIR)/reportbuilder
$(eval $(call gb_Package_set_outdir,reportbuilder-templates,$(INSTDIR)))
$(eval $(call
gb_Package_add_files_with_dir,reportbuilder-templates,share/template, \
-en-US/wizard/report/default.otr \
+common/wizard/report/default.otr \
))
# vim: set noet sw=4 ts=4:
diff --git a/reportbuilder/template/en-US/wizard/report/default.otr
b/reportbuilder/template/common/wizard/report/default.otr
similarity index 100%
rename from reportbuilder/template/en-US/wizard/report/default.otr
rename to reportbuilder/template/common/wizard/report/default.otr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - wizards/com
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java |
14 ++
1 file changed, 14 insertions(+)
New commits:
commit 4e3a02004f3fbab1996910d921294143a25334d4
Author: Csikós Tamás
Date: Mon Jul 1 12:28:21 2013 +0200
fdo#64155 - fix unlocalized 'default' list entry
Change-Id: I3a8b706fe855e7fbff71f227b167a51d3a465be0
Reviewed-on: https://gerrit.libreoffice.org/4673
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
diff --git
a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index 55615af..f80da12 100644
---
a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++
b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -55,6 +55,7 @@ import com.sun.star.wizards.report.IReportDocument;
import com.sun.star.wizards.report.ReportImplementationHelper;
import com.sun.star.wizards.report.ReportLayouter;
import com.sun.star.wizards.report.ReportWizard;
+import com.sun.star.wizards.ui.UIConsts;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -684,9 +685,22 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
break;
}
}
+exchangeLayoutTitlesWithLocalisedOnes(LayoutFiles);
return LayoutFiles;
}
+private void exchangeLayoutTitlesWithLocalisedOnes(String[][] LayoutFiles)
+{
+for(int i = 0; i < LayoutFiles[0].length; ++i)
+{
+if( LayoutFiles[0][i] == null) { break;}
+if( LayoutFiles[0][i].equals("default") )
+{
+LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT
+ 100);
+}
+}
+}
+
public XReportDefinition getReportDefinition()
{
if (m_reportDocument == null)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk|1
cui/source/options/opthtml.cxx | 204 ++--
cui/source/options/opthtml.hxx | 44 +-
cui/uiconfig/ui/opthtmlpage.ui | 647 +
4 files changed, 760 insertions(+), 136 deletions(-)
New commits:
commit 1be8236b688617f93cfaf23fe647632ce53b5ff1
Author: Csikós Tamás
Date: Wed Jul 3 16:42:23 2013 +0200
modern widgetlayout for opthtml
Change-Id: Ibad69d5d9512c1199c6cca3930c1b04f0af4987c
Reviewed-on: https://gerrit.libreoffice.org/4707
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4ef51d6..2f30c25 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
+cui/uiconfig/ui/opthtmlpage \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optmemorypage \
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 9993030..5f53228 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -20,7 +20,6 @@
#include
#include
#include "opthtml.hxx"
-#include "opthtml.hrc"
#include
#include "helpid.hrc"
#include
@@ -44,40 +43,27 @@ const sal_uInt16 aExportToPosArr[] =
// ---
OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
-SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
-aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ),
-aSize1FT( this, CUI_RES( FT_SIZE1 ) ),
-aSize1NF( this, CUI_RES( NF_SIZE1 ) ),
-aSize2FT( this, CUI_RES( FT_SIZE2 ) ),
-aSize2NF( this, CUI_RES( NF_SIZE2 ) ),
-aSize3FT( this, CUI_RES( FT_SIZE3 ) ),
-aSize3NF( this, CUI_RES( NF_SIZE3 ) ),
-aSize4FT( this, CUI_RES( FT_SIZE4 ) ),
-aSize4NF( this, CUI_RES( NF_SIZE4 ) ),
-aSize5FT( this, CUI_RES( FT_SIZE5 ) ),
-aSize5NF( this, CUI_RES( NF_SIZE5 ) ),
-aSize6FT( this, CUI_RES( FT_SIZE6 ) ),
-aSize6NF( this, CUI_RES( NF_SIZE6 ) ),
-aSize7FT( this, CUI_RES( FT_SIZE7 ) ),
-aSize7NF( this, CUI_RES( NF_SIZE7 ) ),
-aImportGB ( this, CUI_RES( GB_IMPORT ) ),
-aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
-aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
-aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ),
-aExportGB ( this, CUI_RES( GB_EXPORT ) ),
-aExportLB ( this, CUI_RES( LB_EXPORT ) ),
-aStarBasicCB( this, CUI_RES( CB_STARBASIC) ),
-aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING) ),
-aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )),
-aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF) ),
-aCharSetFT ( this, CUI_RES( FT_CHARSET ) ),
-aCharSetLB ( this, CUI_RES( LB_CHARSET ) )
-
+SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", rSet )
{
-FreeResource();
+get(aSize1NF,"size1");
+get(aSize2NF,"size2");
+get(aSize3NF,"size3");
+get(aSize4NF,"size4");
+get(aSize5NF,"size5");
+get(aSize6NF,"size6");
+get(aSize7NF,"size7");
+get(aNumbersEnglishUSCB,"numbersenglishus");
+get(aUnknownTagCB,"unknowntag");
+get(aIgnoreFontNamesCB,"ignorefontnames");
+get(aExportLB,"export");
+get(aStarBasicCB,"starbasic");
+get(aStarBasicWarningCB,"starbasicwarning");
+get(aPrintExtensionCB,"printextension");
+get(aSaveGrfLocalCB,"savegrflocal");
+get(aCharSetLB,"charset");
// replace placeholder with UI string from language list
-String aText( aNumbersEnglishUSCB.GetText());
+/*String aText( aNumbersEnglishUSCB->GetText());
String aPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%ENGLISHUSLOCALE"));
xub_StrLen nPos;
if ((nPos = aText.Search( aPlaceholder)) != STRING_NOTFOUND)
@@ -87,15 +73,15 @@ OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const
SfxItemSet& rSet) :
if (rStr.Len())
{
aText.Replace( nPos, aPlaceholder.Len(), rStr);
-aNumbersEnglishUSCB.SetText( aText);
+aNumbersEnglishUSCB->SetText( aText);
}
-}
+}*/
-aExportLB.SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
-aStarBasicCB.SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
+aExportLB->SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
+aStarBasicCB->SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
// initialize the characterset listbox
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/globals.hrc |1
sw/source/ui/config/optdlg.hrc | 33 -
sw/source/ui/config/optdlg.src | 239 -
sw/source/ui/config/optpage.cxx| 178 --
sw/source/ui/dialog/swdlgfact.cxx |1
sw/source/ui/inc/optpage.hxx | 57 +--
sw/uiconfig/swriter/ui/opttablepage.ui | 583 +
8 files changed, 684 insertions(+), 409 deletions(-)
New commits:
commit f39885181180e960be80155a91f60906132b414a
Author: Csikós Tamás
Date: Sun Jul 7 15:35:37 2013 +0200
modern .ui widgetlayout for optpage
Change-Id: I257f4c5878caabd5394bb2641ebf6d82a833e5f1
Reviewed-on: https://gerrit.libreoffice.org/4756
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index dd533a7..58abfe1 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
+ sw/uiconfig/swriter/ui/opttablepage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 8411ebf..60cb591 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -168,7 +168,6 @@
#define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51)
#define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55)
-#define TP_OPTTABLE_PAGE(RC_GLOBALS_BEGIN + 56)
#define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index ffe8233..4dd3868 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -73,37 +73,4 @@
#define LB_LABEL_SIZE 111
#define LB_INDEX_SIZE 112
-//Tabpage Table
-#define CB_HEADER 101
-#define CB_REPEAT_HEADER102
-#define CB_DONT_SPLIT 103
-#define CB_BORDER 104
-#define CB_NUMFORMATTING105
-#define CB_NUMALIGNMENT 106
-#define FL_TABLE107
-#define FL_TABLE_INSERT 108
-#define CB_NUMFMT_FORMATTING109
-#define FL_MOVE 110
-#define FT_ROWMOVE 111
-#define MF_ROWMOVE 112
-#define FT_COLMOVE 113
-#define MF_COLMOVE 114
-#define FT_INSERT 115
-#define FT_ROWINSERT116
-#define MF_ROWINSERT117
-#define FT_COLINSERT118
-#define MF_COLINSERT119
-#define FT_HANDLING 120
-#define RB_FIX 121
-#define RB_FIXPROP 122
-#define RB_VAR 123
-#define FT_FIX 124
-#define FT_FIXPROP 125
-#define FT_VAR 126
-
-#define FT_MOVE 128
-#define FT_COMMENT 133
-#define FL_TABLE_SEPARATOR 139
-#define CB_PROSPECT_RTL140
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 4635874..93b6033 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -195,245 +195,6 @@ TabPage TP_STD_FONT
};
};
-TabPage TP_OPTTABLE_PAGE
-{
-HelpID = HID_OPTTABLE_PAGE ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Hide = TRUE ;
-FixedLine FL_TABLE
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 113 , 8 ) ;
-Text [ en-US ] = "Default";
-};
-CheckBox CB_HEADER
-{
-HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER";
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 107 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "H~eading";
-};
-CheckBox CB_REPEAT_HEADER
-{
-HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER";
-Pos = MAP_APPFONT ( 21 , 27 ) ;
-Size = MAP_APPFONT ( 99 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "Re~peat on each page";
-};
-CheckBox CB_DONT_SPLIT
-{
-HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT";
-Pos = MAP_APPFONT ( 12 , 40 ) ;
-Size = MAP_APPFONT ( 107 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "Do not split";
-};
-CheckBox CB_BORDER
-{
-HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER";
-Pos = MAP_APPFONT ( 12 , 53 ) ;
-Size = MAP_APPFONT ( 107 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "B~order";
-};
-FixedLine FL_TABLE_SEPARATOR
-{
-Pos = MAP_APPFONT ( 120 , 14 ) ;
-
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/globals.hrc |4
sw/source/ui/config/optdlg.hrc | 25 --
sw/source/ui/config/optdlg.src | 178 --
sw/source/ui/config/optpage.cxx | 277 ++
sw/source/ui/inc/optpage.hxx | 42 +--
sw/uiconfig/swriter/ui/optfonttabpage.ui | 381 +++
7 files changed, 540 insertions(+), 368 deletions(-)
New commits:
commit 5c7570be6c987f4a406b7320599bc81197d68885
Author: Csikós Tamás
Date: Mon Jul 8 14:31:53 2013 +0200
.ui layout for optpage/fonttabpage
Change-Id: Ib41ac1b5febbb288f7a05f3823dee6ff32feb315
Reviewed-on: https://gerrit.libreoffice.org/4771
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 58abfe1..f09c26b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/numparapage \
sw/uiconfig/swriter/ui/numberingnamedialog \
sw/uiconfig/swriter/ui/optcomparison \
+ sw/uiconfig/swriter/ui/optfonttabpage \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
sw/uiconfig/swriter/ui/opttablepage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 60cb591..152b894d3 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -35,6 +35,10 @@
#define STR_PAGE(RC_GLOBALS_BEGIN + 14)
#define STR_PRINTOPTUI (RC_GLOBALS_BEGIN + 15)
+#define ST_SCRIPT_WESTERN (RC_GLOBALS_BEGIN + 105)
+#define ST_SCRIPT_ASIAN (RC_GLOBALS_BEGIN + 106)
+#define ST_SCRIPT_CTL (RC_GLOBALS_BEGIN + 107)
+
//EventStrings
#define STR_EVENT_OBJECT_SELECT ( RC_GLOBALS_BEGIN + 17 )
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 4dd3868..cd5f366 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -48,29 +48,4 @@
#define RB_END 82
#define RB_PAGEEND 83
-// Tabpage Basic Fonts
-#define FT_STANDARD 90
-#define LB_STANDARD 91
-#define FT_TITLE92
-#define LB_TITLE93
-#define FT_LIST 94
-#define LB_LIST 95
-#define FT_LABEL96
-#define LB_LABEL97
-#define FT_IDX 98
-#define LB_IDX 99
-#define FL_STDCHR 100
-#define PB_STANDARD101
-#define CB_DOCONLY 102
-#define ST_SCRIPT_WESTERN 103
-#define ST_SCRIPT_ASIAN104
-#define ST_SCRIPT_CTL 105
-#define FT_TYPE106
-#define FT_SIZE107
-#define LB_STANDARD_SIZE 108
-#define LB_TITLE_SIZE 109
-#define LB_LIST_SIZE 110
-#define LB_LABEL_SIZE 111
-#define LB_INDEX_SIZE 112
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 93b6033..748560a 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -24,175 +24,17 @@
#include "optdlg.hrc"
#include "helpid.h"
-TabPage TP_STD_FONT
+String ST_SCRIPT_ASIAN
{
-HelpID = HID_STD_FONT ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Hide = TRUE ;
-FixedLine FL_STDCHR
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = "Basic fonts (%1)";
-};
-FixedText FT_TYPE
-{
-Pos = MAP_APPFONT ( 63 , 14 ) ;
-Size = MAP_APPFONT ( 100 , 8 ) ;
-Text [ en-US ] = "Font";
-};
-FixedText FT_SIZE
-{
-Pos = MAP_APPFONT ( 204 , 14 ) ;
-Size = MAP_APPFONT ( 40 , 8 ) ;
-Text [ en-US ] = "Size";
-};
-MetricBox LB_STANDARD_SIZE
-{
-HelpID = "sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE";
-Pos = MAP_APPFONT ( 204 , 25 ) ;
-Size = MAP_APPFONT ( 30 , 60 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-MetricBox LB_TITLE_SIZE
-{
-HelpID = "sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE";
-Pos = MAP_APPFONT ( 204 , 42 ) ;
-Size = MAP_APPFONT ( 30 , 60 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-MetricBox LB_LIST_SIZE
-{
-HelpID = "sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE";
-Pos = MAP_APPFONT ( 204 , 59 ) ;
-Size = MAP_APPFONT ( 30 , 60 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-MetricBox LB_LABEL_SIZE
-{
-HelpID = "sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE";
-Pos = MAP_APPFONT ( 204
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/source/ui/config/optpage.cxx | 257 +++-
sw/source/ui/inc/optpage.hxx | 51 +--
sw/uiconfig/swriter/ui/optredlinepage.ui | 474 +++
4 files changed, 614 insertions(+), 169 deletions(-)
New commits:
commit b67b78abb57b7d5580dd1e31b86c2c623db528f6
Author: Csikós Tamás
Date: Wed Jul 10 16:23:11 2013 +0200
modern .ui for optpage/redlineoptionstabpage
Change-Id: I848f6cdd11755d9f169e973515d6defc4f3ac420
Reviewed-on: https://gerrit.libreoffice.org/4814
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c528f47..43fc6a0 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/optfonttabpage \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
+sw/uiconfig/swriter/ui/optredlinepage \
sw/uiconfig/swriter/ui/opttablepage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 4aef2e1..25e25ed 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1655,78 +1655,63 @@ namespace
SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
-: SfxTabPage(pParent, SW_RES(TP_REDLINE_OPT), rSet),
+: SfxTabPage(pParent, "OptRedLinePage",
"modules/swriter/ui/optredlinepage.ui" , rSet)
+//,sAuthor ( SW_RES( STR_AUTHOR )),
+//sNone ( SW_RES( STR_NOTHING ))
-aInsertFL( this, SW_RES( FL_TE )),
-
-aInsertFT( this, SW_RES( FT_CHG_INSERT )),
-aInsertAttrFT( this, SW_RES( FT_INS_ATTR )),
-aInsertLB( this, SW_RES( LB_INS_ATTR )),
-aInsertColorFT( this, SW_RES( FT_INS_COL )),
-aInsertColorLB( this, SW_RES( LB_INS_COL )),
-aInsertedPreviewWN( this, SW_RES( WIN_INS )),
-
-aDeletedFT( this, SW_RES( FT_CHG_DELETE )),
-aDeletedAttrFT( this, SW_RES( FT_DEL_ATTR )),
-aDeletedLB( this, SW_RES( LB_DEL_ATTR )),
-aDeletedColorFT(this, SW_RES( FT_DEL_COL )),
-aDeletedColorLB(this, SW_RES( LB_DEL_COL )),
-aDeletedPreviewWN( this, SW_RES( WIN_DEL )),
+{
-aChangedFT( this, SW_RES( FT_CHG_CHANGE )),
-aChangedAttrFT( this, SW_RES( FT_CHG_ATTR )),
-aChangedLB( this, SW_RES( LB_CHG_ATTR )),
-aChangedColorFT(this, SW_RES( FT_CHG_COL )),
-aChangedColorLB(this, SW_RES( LB_CHG_COL )),
-aChangedPreviewWN( this, SW_RES( WIN_CHG )),
+get(pInsertLB,"insert");
+get(pInsertColorLB,"insertcolor");
+get(pInsertedPreviewWN,"insertedpreview");
-aChangedFL ( this, SW_RES( FL_LC )),
+get(pDeletedLB,"deleted");
+get(pDeletedColorLB,"deletedcolor");
+get(pDeletedPreviewWN,"deletedpreview");
-aMarkPosFT ( this, SW_RES( FT_MARKPOS )),
-aMarkPosLB ( this, SW_RES( LB_MARKPOS )),
-aMarkColorFT( this, SW_RES( FT_LC_COL )),
-aMarkColorLB( this, SW_RES( LB_LC_COL )),
-aMarkPreviewWN ( this, SW_RES( WIN_MARK )),
+get(pChangedLB,"changed");
+get(pChangedColorLB,"changedcolor");
+get(pChangedPreviewWN,"changedpreview");
-sAuthor ( SW_RES( STR_AUTHOR )),
-sNone ( SW_RES( STR_NOTHING ))
+get(pMarkPosLB,"markpos");
+get(pMarkColorLB,"markcolor");
+get(pMarkPreviewWN,"markpreview");
-{
-FreeResource();
-
-for(sal_uInt16 i = 0; i < aInsertLB.GetEntryCount(); i++)
+//FreeResource();
+/*
+for(sal_uInt16 i = 0; i < pInsertLB->GetEntryCount(); i++)
{
-String sEntry(aInsertLB.GetEntry(i));
-aDeletedLB.InsertEntry(sEntry);
-aChangedLB.InsertEntry(sEntry);
-};
-
+String sEntry(pInsertLB->GetEntry(i));
+pDeletedLB->InsertEntry(sEntry);
+pChangedLB->InsertEntry(sEntry);
+};*/
+/*
// remove strikethrough from insert and change and underline + double
// underline from delete
-aInsertLB.RemoveEntry(5);
-aChangedLB.RemoveEntry(5);
-aDeletedLB.RemoveEntry(4);
-aDeletedLB.RemoveEntry(3);
+pInsertLB->RemoveEntry(5);
+pChangedLB->RemoveEntry(5);
+pDeletedLB->RemoveEntry(4);
+pDeletedLB->RemoveEntry(3);*/
Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
-aInsertLB.SetSelectHdl( aLk );
-aDeletedLB.SetSelectHdl( aLk );
-aChangedLB.SetSelectHdl( aLk );
+pInsertLB->SetSelectHdl( aLk );
+pDeletedLB->SetSelectHdl( aLk );
+pChangedLB->SetSelect
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/source/ui/frmdlg/frmpage.cxx | 267 +++
sw/source/ui/frmdlg/frmpage.hrc | 16 -
sw/source/ui/frmdlg/frmpage.src | 158 -
sw/source/ui/inc/frmpage.hxx | 41 +--
sw/uiconfig/swriter/ui/frmaddpage.ui | 403 +++
6 files changed, 556 insertions(+), 330 deletions(-)
New commits:
commit 78f5ef0a36f1484b533197136279821497bc4151
Author: Csikós Tamás
Date: Thu Jul 11 18:56:17 2013 +0200
modern .ui widgetlayout for frmpage/frmaddpage
Change-Id: Idbc62b17551398b80711c5a4a4a6c8346580e73e
Reviewed-on: https://gerrit.libreoffice.org/4843
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c4a09e5..7096808 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footendnotedialog \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
+ sw/uiconfig/swriter/ui/frmaddpage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/insertbookmark \
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 274998f..47e98bc 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2741,29 +2741,7 @@ static void lcl_Move(Window& rWin, sal_Int32 nDiff)
}
SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
-SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet),
-
-aNamesFL (this, SW_RES(FL_NAME)),
-aNameFT(this, SW_RES(FT_NAME)),
-aNameED(this, SW_RES(ED_NAME)),
-aAltNameFT (this, SW_RES(FT_ALT_NAME)),
-aAltNameED (this, SW_RES(ED_ALT_NAME)),
-aPrevFT(this, SW_RES(FT_PREV)),
-aPrevLB(this, SW_RES(LB_PREV)),
-aNextFT(this, SW_RES(FT_NEXT)),
-aNextLB(this, SW_RES(LB_NEXT)),
-
-aProtectFL (this, SW_RES(FL_PROTECT)),
-aProtectContentCB (this, SW_RES(CB_PROTECT_CONTENT)),
-aProtectFrameCB(this, SW_RES(CB_PROTECT_FRAME)),
-aProtectSizeCB (this, SW_RES(CB_PROTECT_SIZE)),
-aExtFL (this, SW_RES(FL_EXT)),
-
-aEditInReadonlyCB (this, SW_RES(CB_EDIT_IN_READONLY)),
-aPrintFrameCB (this, SW_RES(CB_PRINT_FRAME)),
-aTextFlowFT(this, SW_RES(FT_TEXTFLOW)),
-aTextFlowLB(this, SW_RES(LB_TEXTFLOW)),
-
+SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui",
rSet),
pWrtSh(0),
nDlgType(0),
@@ -2771,7 +2749,26 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const
SfxItemSet &rSet ) :
bFormat(sal_False),
bNew(sal_False)
{
-FreeResource();
+get(pNamesFT,"");
+get(pNameFT,"name_label");
+get(pNameED,"name");
+get(pAltNameFT,"altname_label");
+get(pAltNameED,"altname");
+get(pPrevFT,"prev_label");
+get(pPrevLB,"prev");
+get(pNextFT,"next_label");
+get(pNextLB,"next");
+get(pProtectFT,"label1");
+
+get(pProtectContentCB,"protectcontent");
+get(pProtectFrameCB,"protectframe");
+get(pProtectSizeCB,"protectsize");
+get(pExtFT,"label2");
+
+get(pEditInReadonlyCB,"editinreadonly");
+get(pPrintFrameCB,"printframe");
+get(pTextFlowFT,"textflow_label");
+get(pTextFlowLB,"textflow");
}
@@ -2791,24 +2788,24 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False;
if(bHtmlMode)
{
-aProtectContentCB .Hide();
-aProtectFrameCB .Hide();
-aProtectSizeCB.Hide();
-aEditInReadonlyCB .Hide();
-aPrintFrameCB .Hide();
-aExtFL.Hide();
-aProtectFL.Hide();
+pProtectContentCB->Hide();
+pProtectFrameCB->Hide();
+pProtectSizeCB->Hide();
+pEditInReadonlyCB->Hide();
+pPrintFrameCB->Hide();
+pExtFT->Hide();
+pProtectFT->Hide();
}
if ( DLG_FRM_GRF == nDlgType || DLG_FRM_OLE == nDlgType )
{
-aEditInReadonlyCB.Hide();
-aPrintFrameCB.SetPosPixel(aEditInReadonlyCB.GetPosPixel());
+pEditInReadonlyCB->Hide();
+pPrintFrameCB->SetPosPixel(pEditInReadonlyCB->GetPosPixel());
}
if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, sal_False,
&pItem))
{
-aAltNameED.SetText(((const SfxStringItem*)pItem)->GetValue());
-aAltNameED.SaveValue();
+pAltNameED->SetText(((const SfxStringItem*)pItem)->GetValue());
+pAltNameED->SaveValue();
}
if(!bFormat)
@@ -2837,50 +2834,50 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
break;
}
-aNameED.SetText( aTmpName1 );
-
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h |1
sw/source/ui/frmdlg/frmpage.cxx | 67
sw/source/ui/frmdlg/frmpage.hrc | 10 -
sw/source/ui/frmdlg/frmpage.src | 88 ---
sw/source/ui/inc/frmpage.hxx | 17 --
sw/uiconfig/swriter/ui/frmurlpage.ui | 266 +++
7 files changed, 304 insertions(+), 146 deletions(-)
New commits:
commit efc09e121ceffb0d2c1b841b809277bd6484f1a7
Author: Csikós Tamás
Date: Fri Jul 12 11:16:44 2013 +0200
modern .ui widgetlayout for frmpage/frmurlpage
Change-Id: Ia308fa393baffc7f456ba613cb216b427c450ca6
Reviewed-on: https://gerrit.libreoffice.org/4854
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 7096808..4cd89ab 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
sw/uiconfig/swriter/ui/frmaddpage \
+ sw/uiconfig/swriter/ui/frmurlpage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/insertbookmark \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 062ae99..c82e46e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -151,7 +151,6 @@
#define HID_LAB_FMT
"SW_HID_LAB_FMT"
#define HID_ENV_ENV
"SW_HID_ENV_ENV"
#define HID_ENV_FMT
"SW_HID_ENV_FMT"
-#define HID_FRM_URL
"SW_HID_FRM_URL"
#define HID_COND_COLL
"SW_HID_COND_COLL"
#define HID_FLD_DB "SW_HID_FLD_DB"
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 210293f..4240747 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2599,22 +2599,17 @@ void BmpWindow::SetGraphic(const Graphic& rGrf)
Description:set URL and ImageMap at frames
***/
SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
-SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
-aHyperLinkFL(this, SW_RES( FL_HYPERLINK )),
-aURLFT (this, SW_RES( FT_URL)),
-aURLED (this, SW_RES( ED_URL)),
-aSearchPB (this, SW_RES( PB_SEARCH )),
-aNameFT (this, SW_RES( FT_NAME )),
-aNameED (this, SW_RES( ED_NAME )),
-aFrameFT(this, SW_RES( FT_FRAME )),
-aFrameCB(this, SW_RES( CB_FRAME )),
-
-aImageFL(this, SW_RES( FL_IMAGE )),
-aServerCB (this, SW_RES( CB_SERVER )),
-aClientCB (this, SW_RES( CB_CLIENT ))
+SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui",
rSet)
{
-FreeResource();
-aSearchPB.SetClickHdl(LINK(this, SwFrmURLPage, InsertFileHdl));
+get(pURLED,"url");
+get(pSearchPB,"search");
+get(pNameED,"name");
+get(pFrameCB,"frame");
+
+get(pServerCB,"server");
+get(pClientCB,"client");
+
+pSearchPB->SetClickHdl(LINK(this, SwFrmURLPage, InsertFileHdl));
}
SwFrmURLPage::~SwFrmURLPage()
@@ -2633,7 +2628,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet )
size_t nCount = pList->size();
for ( size_t i = 0; i < nCount; i++ )
{
-aFrameCB.InsertEntry( *pList->at( i ) );
+pFrameCB->InsertEntry( *pList->at( i ) );
}
for ( size_t i = nCount; i; )
{
@@ -2646,24 +2641,24 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet )
if ( SFX_ITEM_SET == rSet.GetItemState( RES_URL, sal_True, &pItem ) )
{
const SwFmtURL* pFmtURL = (const SwFmtURL*)pItem;
-aURLED.SetText( INetURLObject::decode( pFmtURL->GetURL(),
+pURLED->SetText( INetURLObject::decode( pFmtURL->GetURL(),
INET_HEX_ESCAPE,
INetURLObject::DECODE_UNAMBIGUOUS,
RTL_TEXTENCODING_UTF8 ));
-aNameED.SetText( pFmtURL->GetName());
+pNameED->SetText( pFmtURL->GetName());
-aClientCB.Enable( pFmtURL->GetMap() != 0 );
-aClientCB.Check ( pFmtURL->GetMap() != 0 );
-aServerCB.Check ( pFmtURL->IsServerMap() );
+pClientCB->Enable( pFmtURL->GetMap() != 0 );
+pClientCB->Check ( pFmtURL->GetMap() != 0 );
+pServerCB->Check ( pFmtURL->IsServerMap() );
-aFrameCB.SetText(pFmtURL->GetTargetFrameName());
-aFrameCB.SaveValue();
+pFrameCB->SetText(pFmtURL->GetTargetFra
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|7 --- source/text/swriter/01/05060800.xhp | 28 ++-- 2 files changed, 14 insertions(+), 21 deletions(-) New commits: commit 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 Author: Csikós Tamás Date: Fri Jul 12 12:55:04 2013 +0200 update help ids for frame url page .ui conversion Change-Id: I1d4ec32bebd5815e071d6c2756fcc3323341de02 Reviewed-on: https://gerrit.libreoffice.org/4861 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e7cf9f8..ec9092a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1805,7 +1805,6 @@ HID_FORM_NAVIGATOR_WIN,38069, HID_FRAME_TOOLBOX,54829, HID_FRM_EXT,53169, HID_FRM_STD,53170, -HID_FRM_URL,53189, HID_FTP,41040, HID_FTP_BTN_PATH,41046, HID_FTP_CANCEL,41048, @@ -7773,8 +7772,6 @@ sw_CheckBox_TP_FRM_STD_CB_FOLLOWTEXTFLOW,878167169, sw_CheckBox_TP_FRM_STD_CB_MIRROR,878167077, sw_CheckBox_TP_FRM_STD_CB_REL_HEIGHT,878167141, sw_CheckBox_TP_FRM_STD_CB_REL_WIDTH,878167140, -sw_CheckBox_TP_FRM_URL_CB_CLIENT,878347363, -sw_CheckBox_TP_FRM_URL_CB_SERVER,878347362, sw_CheckBox_TP_FRM_WRAP_CB_ANCHOR_ONLY,878461960, sw_CheckBox_TP_FRM_WRAP_CB_ONLYOUTSIDE,878461977, sw_CheckBox_TP_FRM_WRAP_CB_OUTLINE,878461975, @@ -7841,7 +7838,6 @@ sw_CheckBox_TP_TOX_SELECT_CB_USEFF,879133720, sw_CheckBox_TP_TOX_SELECT_CB_USE_DASH,879133729, sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087, sw_ComboBox_DLG_SAVE_LABEL_CB_MAKE,1446645763, -sw_ComboBox_TP_FRM_URL_CB_FRAME,878350432, sw_ComboBox_TP_INSERT_SECTION_ED_RNAME,879054868, sw_ComboBox_TP_INSERT_SECTION_LB_SUBREG,879054886, sw_ComboBox_TP_OPTCAPTION_PAGE_BOX_CATEGORY,878940174, @@ -7892,8 +7888,6 @@ sw_Edit_TP_FLD_VAR_ED_VARNAME,878741535, sw_Edit_TP_FLD_VAR_ED_VARSEPARATOR,878741546, sw_Edit_TP_FLD_VAR_ED_VARVALUE,878741537, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, -sw_Edit_TP_FRM_URL_ED_NAME,878348399, -sw_Edit_TP_FRM_URL_ED_URL,878348347, sw_Edit_TP_GRF_EXT_ED_CONNECT,878233654, sw_Edit_TP_INSERT_SECTION_ED_CONDITION,879052813, sw_Edit_TP_INSERT_SECTION_ED_FILE,879052816, @@ -8221,7 +8215,6 @@ sw_PushButton_TP_FLD_FUNC_PB_LISTDOWN,878776919, sw_PushButton_TP_FLD_FUNC_PB_LISTREMOVE,878776917, sw_PushButton_TP_FLD_FUNC_PB_LISTUP,878776918, sw_PushButton_TP_FRM_STD_BT_REALSIZE,878170668, -sw_PushButton_TP_FRM_URL_PB_SEARCH,878350951, sw_PushButton_TP_GRF_EXT_PB_BROWSE,878236213, sw_PushButton_TP_INSERT_SECTION_PB_FILE,879055400, sw_PushButton_TP_INSERT_SECTION_PB_PASSWD,879055411, diff --git a/source/text/swriter/01/05060800.xhp b/source/text/swriter/01/05060800.xhp index 30d2c86..fc71994 100644 --- a/source/text/swriter/01/05060800.xhp +++ b/source/text/swriter/01/05060800.xhp @@ -33,39 +33,39 @@ pictures; defining hyperlinks hyperlinks; for objects - + Hyperlink - Specify the properties of the hyperlink for the selected graphic, frame or OLE object. + Specify the properties of the hyperlink for the selected graphic, frame or OLE object. Link to Set the link properties. - + URL - Enter the complete path to the file that you want to open. - + Enter the complete path to the file that you want to open. + Browse - Locate the file that you want the hyperlink to open, and then click Open. The target file can be on your machine or on an FTP server in the Internet. - + Locate the file that you want the hyperlink to open, and then click Open. The target file can be on your machine or on an FTP server in the Internet. + Name - Enter a name for the hyperlink. - + Enter a name for the hyperlink. + Frame - Specify the name of the frame where you want to open the targeted file. The predefined target frame names are described here. + Specify the name of the frame where you want to open the targeted file. The predefined target frame names are described here. Image Map Select the type of ImageMap that you want to use. The ImageMap settings override the hyperlink settings that you enter on this page. - + Server-side image map - Uses a server-side image map. - + Uses a server-side image map. + Client-side image map - Uses the image map that you created for the selected object. + Uses the image map that you created for the selected object. URL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 146e3927f06cf5d1f1782a3dd6b04fc68945bad6 Author: Csikós Tamás Date: Fri Jul 12 12:55:04 2013 +0200 Updated core Project: help 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 update help ids for frame url page .ui conversion Change-Id: I1d4ec32bebd5815e071d6c2756fcc3323341de02 Reviewed-on: https://gerrit.libreoffice.org/4861 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index de54c17..38c2d6d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit de54c17248708f728177be7a3421da1dc0e97504 +Subproject commit 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/source/ui/inc/areasdlg.hxx| 36 +--
sc/source/ui/pagedlg/areasdlg.cxx| 205 +-
sc/source/ui/pagedlg/pagedlg.hrc | 22 -
sc/source/ui/pagedlg/pagedlg.src | 132 ---
sc/uiconfig/scalc/ui/printareasdialog.ui | 348 +++
6 files changed, 471 insertions(+), 273 deletions(-)
New commits:
commit 9f0644d62f5d54a8d2788f358c850df2fcb1516b
Author: Csikós Tamás
Date: Fri Jul 12 15:50:41 2013 +0200
modern .ui widgetlayout for areasdlg/printareasdlg
Change-Id: I91ae85f6ca896bdc91d43654213a079480e627e0
Reviewed-on: https://gerrit.libreoffice.org/4866
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 72e7547..ddf13e8 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optdlg \
sc/uiconfig/scalc/ui/optformula \
sc/uiconfig/scalc/ui/optsortlists \
+ sc/uiconfig/scalc/ui/printareasdialog \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/rightfooterdialog \
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 64c33ce..9f0a03e 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -48,24 +48,24 @@ public:
virtual sal_BoolClose();
private:
-FixedLine aFlPrintArea;
-ListBox aLbPrintArea;
-formula::RefEditaEdPrintArea;
-formula::RefButton aRbPrintArea;
-
-FixedLine aFlRepeatRow;
-ListBox aLbRepeatRow;
-formula::RefEditaEdRepeatRow;
-formula::RefButton aRbRepeatRow;
-
-FixedLine aFlRepeatCol;
-ListBox aLbRepeatCol;
-formula::RefEditaEdRepeatCol;
-formula::RefButton aRbRepeatCol;
-
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton aBtnHelp;
+FixedLine* pFlPrintArea;
+ListBox* pLbPrintArea;
+formula::RefEdit*pEdPrintArea;
+formula::RefButton* pRbPrintArea;
+
+FixedLine* pFlRepeatRow;
+ListBox* pLbRepeatRow;
+formula::RefEdit*pEdRepeatRow;
+formula::RefButton* pRbRepeatRow;
+
+FixedLine* pFlRepeatCol;
+ListBox* pLbRepeatCol;
+formula::RefEdit*pEdRepeatCol;
+formula::RefButton* pRbRepeatCol;
+
+OKButton*pBtnOk;
+CancelButton*pBtnCancel;
+HelpButton* pBtnHelp;
sal_BoolbDlgLostFocus;
formula::RefEdit* pRefInputEdit;
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx
b/sc/source/ui/pagedlg/areasdlg.cxx
index 1235314..97b8a16 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -105,33 +105,38 @@ static void printAddressFlags(sal_uInt16 nFlag)
//
ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent )
-: ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS),
-//
-aFlPrintArea( this, ScResId( FL_PRINTAREA ) ),
-aLbPrintArea( this, ScResId( LB_PRINTAREA ) ),
-aEdPrintArea( this, this, &aFlPrintArea, ScResId( ED_PRINTAREA ) ),
-aRbPrintArea( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ),
-//
-aFlRepeatRow( this, ScResId( FL_REPEATROW ) ),
-aLbRepeatRow( this, ScResId( LB_REPEATROW ) ),
-aEdRepeatRow( this, this, &aFlRepeatRow, ScResId( ED_REPEATROW ) ),
-aRbRepeatRow( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ),
-//
-aFlRepeatCol( this, ScResId( FL_REPEATCOL ) ),
-aLbRepeatCol( this, ScResId( LB_REPEATCOL ) ),
-aEdRepeatCol( this, this, &aFlRepeatCol, ScResId( ED_REPEATCOL ) ),
-aRbRepeatCol( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ),
-//
-aBtnOk ( this, ScResId( BTN_OK ) ),
-aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-aBtnHelp( this, ScResId( BTN_HELP ) ),
+: ScAnyRefDlg ( pB, pCW, pParent, "PrintAreasDialog",
"modules/scalc/ui/printareasdialog.ui"),
//
bDlgLostFocus ( false ),
-pRefInputEdit ( &aEdPrintArea ),
pDoc( NULL ),
pViewData ( NULL ),
nCurTab ( 0 )
{
+get(pFlPrintArea,"label1");
+get(pLbPrintArea,"lbprintarea");
+get(pEdPrintArea,"edprintarea");
+pEdPrintArea->SetReferences(this, pFlPrintArea);
+pRefInputEdit = pEdPrintArea;
+get(pRbPrintArea,"rbprintarea");
+pRbPrintArea->SetReferences(this, pEdPrintArea);
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c8109193f0d435977c64c1eeec6c734d3d49bc8 Author: Csikós Tamás Date: Fri Jul 12 16:45:28 2013 +0200 Updated core Project: help 4096747c2cfa974b1e5b544c36ceff2d85667fc0 update help ids for print areas dialog .ui conversion Change-Id: Icc747e1cb2387aacf806b38aa8a599bf1fec75bd Reviewed-on: https://gerrit.libreoffice.org/4867 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 38c2d6d..4096747 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 +Subproject commit 4096747c2cfa974b1e5b544c36ceff2d85667fc0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 - source/text/scalc/01/05080300.xhp | 18 +- source/text/shared/00/0001.xhp |6 +++--- 3 files changed, 12 insertions(+), 21 deletions(-) New commits: commit 4096747c2cfa974b1e5b544c36ceff2d85667fc0 Author: Csikós Tamás Date: Fri Jul 12 16:45:28 2013 +0200 update help ids for print areas dialog .ui conversion Change-Id: Icc747e1cb2387aacf806b38aa8a599bf1fec75bd Reviewed-on: https://gerrit.libreoffice.org/4867 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ec9092a..72fab47 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6372,9 +6372,6 @@ sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793, sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_END,1495440898, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_START,1495440897, -sc_Edit_RID_SCDLG_AREAS_ED_PRINTAREA,2568275979, -sc_Edit_RID_SCDLG_AREAS_ED_REPEATCOL,2568275999, -sc_Edit_RID_SCDLG_AREAS_ED_REPEATROW,2568275989, sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575, sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_AREA,2568783885, sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_DATA,2568783889, @@ -6418,9 +6415,6 @@ sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233, sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, sc_FloatingWindow_RID_SCDLG_TEAM,231304704, sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481, -sc_ImageButton_RID_SCDLG_AREAS_RB_PRINTAREA,2568285708, -sc_ImageButton_RID_SCDLG_AREAS_RB_REPEATCOL,2568285728, -sc_ImageButton_RID_SCDLG_AREAS_RB_REPEATROW,2568285718, sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304, sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_AREA,2568793614, sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_DATA,2568793618, @@ -6446,9 +6440,6 @@ sc_ImageButton_RID_SCDLG_TABOP_RB_ROWCELL,2567908866, sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289, sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291, sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290, -sc_ListBox_RID_SCDLG_AREAS_LB_PRINTAREA,2568277517, -sc_ListBox_RID_SCDLG_AREAS_LB_REPEATCOL,2568277537, -sc_ListBox_RID_SCDLG_AREAS_LB_REPEATROW,2568277527, sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257, sc_ListBox_RID_SCDLG_COLROWNAMERANGES_LB_RANGE,2568785419, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_1,2568523266, diff --git a/source/text/scalc/01/05080300.xhp b/source/text/scalc/01/05080300.xhp index 1278395..f417b6a 100644 --- a/source/text/scalc/01/05080300.xhp +++ b/source/text/scalc/01/05080300.xhp @@ -39,23 +39,23 @@ - - + + Print range -Allows you to modify a defined print range. +Allows you to modify a defined print range. Select -none- to remove a print range definition for the current spreadsheet. Select -entire sheet- to set the current sheet as a print range. Select -selection- to define the selected area of a spreadsheet as the print range. By selecting -user-defined-, you can define a print range that you have already defined using the Format - Print Ranges - Define command. If you have given a name to a range using the Insert - Names - Define command, this name will be displayed and can be selected from the list box. In the right-hand text box, you can enter a print range by reference or by name. If the cursor is in the Print range text box, you can also select the print range in the spreadsheet with your mouse. - - + + Rows to repeat -Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or "$1" or "$2:$3". The list box displays -user defined-. You can also select -none- to remove a defined repeating row. +Choose one or more rows to print on every page. In the right text box enter the row reference, for example, "1" or "$1" or "$2:$3". The list box displays -user defined-. You can also select -none- to remove a defined repeating row. You can also define repeating rows by dragging the mouse in the spreadsheet, if the cursor is in the Rows to repeat text field in the dialog. - - + + Columns to repeat -Choose one or more columns to print on every page. In the right text box enter the column reference, for example, "A" or "AB" or "$C:$E". The list box then displays -user defined-. You can also select -none- to remove a defined repeating column. +Choose one or more columns to print on every page. In the right text box enter the column reference, for example, "A" or "AB" or "$C:$E". The list box then displays -user defined-. You can also select -none- to remove a defined repeating column. You can also define repeating columns by dragging the mouse in the spreadsheet, if the cursor is in the Columns to repeat text field in the dialog. diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index afdbf75..e37b2ec 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -143,
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/inc/optdict.hxx| 15 --
cui/source/options/optdict.cxx| 46 ++-
cui/source/options/optdict.hrc|8 -
cui/source/options/optdict.src| 71 --
cui/uiconfig/ui/optnewdictionarydialog.ui | 194 ++
6 files changed, 218 insertions(+), 117 deletions(-)
New commits:
commit 766458eafb855a44b1c4c9a5342bbb3748b7ef23
Author: Csikós Tamás
Date: Mon Jul 15 14:16:42 2013 +0200
modern .ui widgetlayout for optdict/newdictdlg
Change-Id: I8bd0a334bffee9adcf23fe2f597b66924b57ce30
Reviewed-on: https://gerrit.libreoffice.org/4917
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 5f51232..0908fef 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optmemorypage \
+ cui/uiconfig/ui/optnewdictionarydialog \
cui/uiconfig/ui/optonlineupdatepage \
cui/uiconfig/ui/optpathspage \
cui/uiconfig/ui/optproxypage \
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 2251a2b..246b091 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -50,15 +50,12 @@ namespace linguistic2{
class SvxNewDictionaryDialog : public ModalDialog
{
private:
-FixedLineaNewDictBox;
-FixedText aNameText;
-EditaNameEdit;
-FixedText aLanguageText;
-SvxLanguageBox aLanguageLB;
-CheckBoxaExceptBtn;
-OKButtonaOKBtn;
-CancelButtonaCancelBtn;
-HelpButton aHelpBtn;
+Edit*pNameEdit;
+SvxLanguageBox* pLanguageLB;
+CheckBox*pExceptBtn;
+OKButton*pOKBtn;
+CancelButton*pCancelBtn;
+HelpButton* pHelpBtn;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
::com::sun::star::uno::Reference<
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 36af1fb..020cb17 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -82,41 +82,29 @@ static CDE_RESULT cmpDicEntry_Impl( const String &rText1,
const String &rText2 )
SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
Reference< XSpellChecker1 > &xSpl ) :
-ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ),
-
-aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ),
-aNameText ( this, CUI_RES( FT_DICTNAME ) ),
-aNameEdit ( this, CUI_RES( ED_DICTNAME ) ),
-aLanguageText ( this, CUI_RES( FT_DICTLANG ) ),
-aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ),
-aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ),
-aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ),
-aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ),
-aHelpBtn( this, CUI_RES( BTN_NEWDICT_HLP ) ),
+ModalDialog( pParent, "OptNewDictionaryDialog" ,
"cui/ui/optnewdictionarydialog.ui" ),
+
xSpell( xSpl )
{
+get(pNameEdit,"nameedit");
+get(pLanguageLB,"language");
+get(pExceptBtn,"except");
+get(pOKBtn,"ok");
// install handler
-aNameEdit.SetModifyHdl(
+pNameEdit->SetModifyHdl(
LINK( this, SvxNewDictionaryDialog, ModifyHdl_Impl ) );
-aOKBtn.SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) );
+pOKBtn->SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) );
// display languages
-aLanguageLB.SetLanguageList( LANG_LIST_ALL, sal_True, sal_True );
-aLanguageLB.SelectEntryPos(0);
-
-aNameText.SetAccessibleRelationMemberOf( &aNewDictBox );
-aNameEdit.SetAccessibleRelationMemberOf( &aNewDictBox );
-aLanguageText.SetAccessibleRelationMemberOf( &aNewDictBox );
-aLanguageLB.SetAccessibleRelationMemberOf( &aNewDictBox );
-
-FreeResource();
+pLanguageLB->SetLanguageList( LANG_LIST_ALL, sal_True, sal_True );
+pLanguageLB->SelectEntryPos(0);
}
// ---
IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
{
-OUString sDict = comphelper::string::stripEnd(aNameEdit.GetText(), ' ');
+OUString sDict = comphelper::string::stripEnd(pNameEdit->GetText(), ' ');
// add extension for personal dictionaries
sDict += ".dic";
@@ -138,16 +126,16 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
{
// duplicate names?
InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
-aNameEdit.GrabFocus();
+pNameEdit->GrabFocus();
return 0;
}
// create and add
-sal_uInt16 nLang = aLanguageLB.GetSelectLanguage();
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 712019343e002ed64e7f4e00cc224af3559ed912 Author: Csikós Tamás Date: Mon Jul 15 14:33:18 2013 +0200 Updated core Project: help 696273411433e4de4411d84837307d8815f42378 update help ids for opt new dictionary dialog .ui conversion Change-Id: I36d3b7c9f216d9a9f940885c8d4b2f16706ddc01 Reviewed-on: https://gerrit.libreoffice.org/4918 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 7885eab..6962734 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7885eab3d5f01e8208310ca2f4258df5cbfdb999 +Subproject commit 696273411433e4de4411d84837307d8815f42378 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/optionen/01010400.xhp | 12 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 696273411433e4de4411d84837307d8815f42378 Author: Csikós Tamás Date: Mon Jul 15 14:33:18 2013 +0200 update help ids for opt new dictionary dialog .ui conversion Change-Id: I36d3b7c9f216d9a9f940885c8d4b2f16706ddc01 Reviewed-on: https://gerrit.libreoffice.org/4918 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index f499e74..3fff662 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6948,7 +6948,6 @@ svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS,809206786, svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709, -svx_CheckBox_RID_SFXDLG_NEWDICT_BTN_EXCEPT,1270400014, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CALCULATE,1368851483, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CONSTRAINT,1368851479, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY,1368851481, @@ -7031,7 +7030,6 @@ svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796, svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, svx_Edit_RID_SFXDLG_EDITDICT_ED_REPLACE,1270417446, svx_Edit_RID_SFXDLG_EDITDICT_ED_WORD,1270417444, -svx_Edit_RID_SFXDLG_NEWDICT_ED_DICTNAME,1270401035, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796, @@ -7185,7 +7183,6 @@ svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095, svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323, svx_ListBox_RID_SFXDLG_EDITDICT_LB_ALLDICTS,1270418976, svx_ListBox_RID_SFXDLG_EDITDICT_LB_DICTLANG,1270418957, -svx_ListBox_RID_SFXDLG_NEWDICT_LB_DICTLANG,1270402573, svx_ListBox_RID_SVXDLG_ADD_DATAITEM_LB_DATATYPE,1368854034, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568, diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index cebabdc..8c93bd5 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -65,15 +65,15 @@ Opens the New Dictionary dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language. New Dictionary In the Dictionary section you can name a new user-defined dictionary or dictionary of exceptions and specify the language. - + Name -Specifies the name of the new custom dictionary. The file extension "*.DIC" is automatically appended. - +Specifies the name of the new custom dictionary. The file extension "*.DIC" is automatically appended. + Language -By selecting a certain language you can limit the use of the custom dictionary. By selecting All the custom dictionary is used independently of the current language. - +By selecting a certain language you can limit the use of the custom dictionary. By selecting All the custom dictionary is used independently of the current language. + Exceptions (-) -Specifies whether you wish to avoid certain words in your documents. In this way, you can create a custom dictionary of all the words to be avoided. If this exception dictionary is activated, during spellchecking you receive a corresponding note about any words which should be avoided. +Specifies whether you wish to avoid certain words in your documents. In this way, you can create a custom dictionary of all the words to be avoided. If this exception dictionary is activated, during spellchecking you receive a corresponding note about any words which should be avoided. Edit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/source/ui/dbgui/foptmgr.cxx | 261 +++
sc/source/ui/dbgui/sfiltdlg.cxx | 190 +--
sc/source/ui/inc/filtdlg.hxx | 47 +-
sc/source/ui/inc/filter.hrc |4
sc/source/ui/inc/foptmgr.hxx | 76
sc/source/ui/src/filter.src |4
sc/uiconfig/scalc/ui/advancedfilterdialog.ui | 443 +++
8 files changed, 899 insertions(+), 127 deletions(-)
New commits:
commit 0ef78be4576672a74cdad1dfb48a9e918c48be27
Author: Csikós Tamás
Date: Tue Jul 16 12:51:47 2013 +0200
modern .ui widgetlayout for sfilterdlg
Change-Id: I0182338fe2d70d6484d2e7edc2ee621d1a19f150
Reviewed-on: https://gerrit.libreoffice.org/4934
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index cab8091..0dc6338 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
))
$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
+ sc/uiconfig/scalc/ui/advancedfilterdialog \
sc/uiconfig/scalc/ui/allheaderfooterdialog \
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/createnamesdialog \
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 5d31d1d..3d02a97 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -29,7 +29,9 @@
#include "globalnames.hxx"
#define _FOPTMGR_CXX
+#define _NEWFOPTMGR_CXX
#include "foptmgr.hxx"
+#undef _NEWFOPTMGR_CXX
#undef _FOPTMGR_CXX
//
@@ -323,5 +325,264 @@ IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl,
CheckBox*, pBox )
return 0;
}
+//
+// ScNewFilterOptionsMgr (.ui's option helper)
+//
+
+ScNewFilterOptionsMgr::ScNewFilterOptionsMgr(
+ScViewData* ptrViewData,
+const ScQueryParam& refQueryData,
+CheckBox* refBtnCase,
+CheckBox* refBtnRegExp,
+CheckBox* refBtnHeader,
+CheckBox* refBtnUnique,
+CheckBox* refBtnCopyResult,
+CheckBox* refBtnDestPers,
+ListBox*refLbCopyArea,
+Edit* refEdCopyArea,
+formula::RefButton* refRbCopyArea,
+FixedText* refFtDbAreaLabel,
+FixedText* refFtDbArea,
+const String& refStrUndefined )
+
+: pViewData ( ptrViewData ),
+pDoc( ptrViewData ? ptrViewData->GetDocument() : NULL ),
+pBtnCase( refBtnCase ),
+pBtnRegExp ( refBtnRegExp ),
+pBtnHeader ( refBtnHeader ),
+pBtnUnique ( refBtnUnique ),
+pBtnCopyResult ( refBtnCopyResult ),
+pBtnDestPers( refBtnDestPers ),
+pLbCopyArea ( refLbCopyArea ),
+pEdCopyArea ( refEdCopyArea ),
+pRbCopyArea ( refRbCopyArea ),
+pFtDbAreaLabel ( refFtDbAreaLabel ),
+pFtDbArea ( refFtDbArea ),
+rStrUndefined ( refStrUndefined ),
+rQueryData ( refQueryData )
+{
+Init();
+}
+
+
+//
+
+ScNewFilterOptionsMgr::~ScNewFilterOptionsMgr()
+{
+sal_uInt16 nEntries = pLbCopyArea->GetEntryCount();
+sal_uInt16 i;
+
+for ( i=2; iGetEntryData( i );
+}
+
+
+//
+
+void ScNewFilterOptionsMgr::Init()
+{
+//moggi:TODO
+OSL_ENSURE( pViewData && pDoc, "Init failed :-/" );
+
+pLbCopyArea->SetSelectHdl ( LINK( this, ScNewFilterOptionsMgr,
LbAreaSelHdl ) );
+pEdCopyArea->SetModifyHdl ( LINK( this, ScNewFilterOptionsMgr,
EdAreaModifyHdl ) );
+pBtnCopyResult->SetToggleHdl ( LINK( this, ScNewFilterOptionsMgr,
BtnCopyResultHdl ) );
+
+pBtnCase ->Check( rQueryData.bCaseSens );
+pBtnHeader ->Check( rQueryData.bHasHeader );
+pBtnRegExp ->Check( rQueryData.bRegExp );
+pBtnUnique ->Check( !rQueryData.bDuplicate );
+
+if ( pViewData && pDoc )
+{
+OUString theAreaStr;
+ScRange theCurArea ( ScAddress( rQueryData.nCol1,
+rQueryData.nRow1,
+
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 13 - source/text/scalc/01/12040201.xhp | 30 +++--- source/text/scalc/01/12040300.xhp |6 +++--- source/text/shared/00/0001.xhp |4 ++-- 4 files changed, 20 insertions(+), 33 deletions(-) New commits: commit a9a5eef71062ee0fe8ab18845166af73f6e25a00 Author: Csikós Tamás Date: Wed Jul 17 18:29:19 2013 +0200 update help ids for advanced filter dialog .ui conversion Change-Id: I3f4ed027caf18871f6642eb96c2f857d77cad242 Reviewed-on: https://gerrit.libreoffice.org/4961 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 8b39d6b..14e8ede 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6325,12 +6325,6 @@ sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW,2567504924, sc_CheckBox_RID_SCDLG_RETYPEPASS_INPUT_BTN_MATCH_OLD_PASSWORD,1495680305, sc_CheckBox_RID_SCDLG_ROW_MAN_BTN_DEFVAL,1494942721, sc_CheckBox_RID_SCDLG_ROW_OPT_BTN_DEFVAL,1494959105, -sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_CASE,2567095298, -sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_COPY_RESULT,2567095301, -sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_DEST_PERS,2567095308, -sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_HEADER,2567095300, -sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_REGEXP,2567095299, -sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_UNIQUE,2567095297, sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625, sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623, sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609, @@ -6388,8 +6382,6 @@ sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943, sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326, sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD2,1495681328, sc_Edit_RID_SCDLG_SIMPLEREF_ED_ASSIGN,2568996875, -sc_Edit_RID_SCDLG_SPEC_FILTER_ED_COPY_AREA,2567096327, -sc_Edit_RID_SCDLG_SPEC_FILTER_ED_CRITERIA_AREA,2567096372, sc_Edit_RID_SCDLG_STRINPUT_ED_INPUT,1493469194, sc_Edit_RID_SCDLG_TABOP_ED_COLCELL,2567899139, sc_Edit_RID_SCDLG_TABOP_ED_FORMULARANGE,2567899137, @@ -6418,8 +6410,6 @@ sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672, sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604, -sc_ImageButton_RID_SCDLG_SPEC_FILTER_RB_COPY_AREA,2567106056, -sc_ImageButton_RID_SCDLG_SPEC_FILTER_RB_CRITERIA_AREA,2567106101, sc_ImageButton_RID_SCDLG_TABOP_RB_COLCELL,2567908867, sc_ImageButton_RID_SCDLG_TABOP_RB_FORMULARANGE,2567908865, sc_ImageButton_RID_SCDLG_TABOP_RB_ROWCELL,2567908866, @@ -6479,8 +6469,6 @@ sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD3,1493749274, sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP1,1493749275, sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP2,1493749276, sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA,2567507478, -sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_COPY_AREA,2567097862, -sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_CRITERIA_AREA,2567097907, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974, @@ -6507,7 +6495,6 @@ sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, sc_MoreButton_RID_SCDLG_FILTER_BTN_MORE,2567090689, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676, -sc_MoreButton_RID_SCDLG_SPEC_FILTER_BTN_MORE,2567107073, sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541, sc_MultiLineEdit_TP_VALIDATION_ERROR_EDT_ERROR,548309529, sc_MultiLineEdit_TP_VALIDATION_INPUTHELP_EDT_INPUTHELP,548293135, diff --git a/source/text/scalc/01/12040201.xhp b/source/text/scalc/01/12040201.xhp index 54e683d..11ca7af 100644 --- a/source/text/scalc/01/12040201.xhp +++ b/source/text/scalc/01/12040201.xhp @@ -29,40 +29,40 @@ More - -Shows additional filter options. + +Shows additional filter options. Options - + Case sensitive -Distinguishes between uppercase and lowercase letters when filtering the data. +Distinguishes between uppercase and lowercase letters when filtering the data. - + Range contains column labels -Includes the column labels in the first row of a cell range. +Includes the column labels in the first row of a cell range. - + - + - + Copy results to -Select the check box, and then select the cell range where you want to display the filter results. You can also select a named range from the list. +Select the check box, and then select the cell range where you want to display the filter results. You can also select a named range from the list. - + Regular expression -Allows you to use wildcards in the filter definition. For a list of the regular expressions that $[officename] supports, click here. +Allows you to use wildcards in the filter definition. For a list of the regular expressions that $[officename] supports, click here. If the Regular Expressions
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bdb88187b4c057080d93c2b18b41c483ca53eac3 Author: Csikós Tamás Date: Wed Jul 17 18:29:19 2013 +0200 Updated core Project: help a9a5eef71062ee0fe8ab18845166af73f6e25a00 update help ids for advanced filter dialog .ui conversion Change-Id: I3f4ed027caf18871f6642eb96c2f857d77cad242 Reviewed-on: https://gerrit.libreoffice.org/4961 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 48fa20a..a9a5eef 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 48fa20a5cd43b2f132709e7ad9274627c1983d9b +Subproject commit a9a5eef71062ee0fe8ab18845166af73f6e25a00 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a0de2add9c6e111749d3f14f4c57d6498952fa1d Author: Csikós Tamás Date: Fri Jul 19 11:38:20 2013 +0200 Updated core Project: help e4526b209da16ffbbad6cff4dc10de41f0b3e133 update help ids for standard filter dialog .ui conversion Change-Id: If608070b1495305747be0b0e5ed3262e4bc8d269 Reviewed-on: https://gerrit.libreoffice.org/4978 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index c7362ec..e4526b2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c7362eccbd333bcfc919bc981a4c10327fdb6c8d +Subproject commit e4526b209da16ffbbad6cff4dc10de41f0b3e133 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 26 -- source/text/scalc/01/12040201.xhp | 20 ++-- source/text/shared/00/0001.xhp |2 +- source/text/shared/02/12090100.xhp | 24 4 files changed, 23 insertions(+), 49 deletions(-) New commits: commit e4526b209da16ffbbad6cff4dc10de41f0b3e133 Author: Csikós Tamás Date: Fri Jul 19 11:38:20 2013 +0200 update help ids for standard filter dialog .ui conversion Change-Id: If608070b1495305747be0b0e5ed3262e4bc8d269 Reviewed-on: https://gerrit.libreoffice.org/4978 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 14e8ede..7f8625b 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6282,12 +6282,6 @@ sc_CheckBox_RID_SCDLG_DBNAMES_BTN_SIZE,2567324694, sc_CheckBox_RID_SCDLG_DBNAMES_BTN_STRIPDATA,2567324696, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474, sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475, -sc_CheckBox_RID_SCDLG_FILTER_BTN_CASE,2567078914, -sc_CheckBox_RID_SCDLG_FILTER_BTN_COPY_RESULT,2567078917, -sc_CheckBox_RID_SCDLG_FILTER_BTN_DEST_PERS,2567078924, -sc_CheckBox_RID_SCDLG_FILTER_BTN_HEADER,2567078916, -sc_CheckBox_RID_SCDLG_FILTER_BTN_REGEXP,2567078915, -sc_CheckBox_RID_SCDLG_FILTER_BTN_UNIQUE,2567078913, sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT,2568963085, sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_ACCEPT,2568963078, sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_REJECT,2568963079, @@ -6341,10 +6335,6 @@ sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228, sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203, sc_ComboBox_RID_SCDLG_DAPIDATA_CB_OBJECT,1495355413, sc_ComboBox_RID_SCDLG_DBNAMES_ED_NAME,2567327755, -sc_ComboBox_RID_SCDLG_FILTER_ED_VAL1,2567082016, -sc_ComboBox_RID_SCDLG_FILTER_ED_VAL2,2567082017, -sc_ComboBox_RID_SCDLG_FILTER_ED_VAL3,2567082018, -sc_ComboBox_RID_SCDLG_FILTER_ED_VAL4,2567082024, sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749, sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751, sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792, @@ -6374,7 +6364,6 @@ sc_Edit_RID_SCDLG_DPNUMGROUP_ED_START,1495418881, sc_Edit_RID_SCDLG_FILLSERIES_ED_END_VALUES,1493518385, sc_Edit_RID_SCDLG_FILLSERIES_ED_INCREMENT,1493518375, sc_Edit_RID_SCDLG_FILLSERIES_ED_START_VALUES,1493518388, -sc_Edit_RID_SCDLG_FILTER_ED_COPY_AREA,2567079943, sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111, sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027, sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962, @@ -6405,7 +6394,6 @@ sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_2,2568531484, sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DATA_AREA,2567532066, sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DEST_AREA,2567532076, sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438, -sc_ImageButton_RID_SCDLG_FILTER_RB_COPY_AREA,2567089672, sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672, @@ -6442,19 +6430,6 @@ sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_LAYOUT,1495404038, sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_FROM,1495404039, sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_USING,1495404040, sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SORT_BY,1495404037, -sc_ListBox_RID_SCDLG_FILTER_LB_COND1,2567081501, -sc_ListBox_RID_SCDLG_FILTER_LB_COND2,2567081502, -sc_ListBox_RID_SCDLG_FILTER_LB_COND3,2567081503, -sc_ListBox_RID_SCDLG_FILTER_LB_COND4,2567081511, -sc_ListBox_RID_SCDLG_FILTER_LB_COPY_AREA,2567081478, -sc_ListBox_RID_SCDLG_FILTER_LB_FIELD1,2567081496, -sc_ListBox_RID_SCDLG_FILTER_LB_FIELD2,2567081497, -sc_ListBox_RID_SCDLG_FILTER_LB_FIELD3,2567081498, -sc_ListBox_RID_SCDLG_FILTER_LB_FIELD4,2567081510, -sc_ListBox_RID_SCDLG_FILTER_LB_OP1,2567081499, -sc_ListBox_RID_SCDLG_FILTER_LB_OP2,2567081500, -sc_ListBox_RID_SCDLG_FILTER_LB_OP3,2567081509, -sc_ListBox_RID_SCDLG_FILTER_LB_OP4,2567081514, sc_ListBox_RID_SCDLG_IMPORTOPT_DDLB_FONT,1494175241, sc_ListBox_RID_SCDLG_IMPORTOPT_LB_FONT,1494175242, sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338, @@ -6492,7 +6467,6 @@ sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576, sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060, sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481, sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, -sc_MoreButton_RID_SCDLG_FILTER_BTN_MORE,2567090689, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676, sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541, diff --git a/source/text/scalc/01/12040201.xhp b/source/text/scalc/01/12040201.xhp index 11ca7af..dc4b137 100644 --- a/source/text/scalc/01/12040201.xhp +++ b/source/text/scalc/01/12040201.xhp @@ -28,7 +28,7 @@ More - + Shows additional filter options.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b1949c08bb32a30d28a4bc154fd43a003b1be307 Author: Csikós Tamás Date: Fri Jul 19 14:51:11 2013 +0200 Updated core Project: help a69f6c251b155dfd40aeacf83a21951cdb298898 update help ids for sub total options page .ui conversion Change-Id: Id89c30fb2393f7c9216f56ffd782ec56b13aab2c Reviewed-on: https://gerrit.libreoffice.org/4984 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index ed0bd6d..a69f6c2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ed0bd6de3bb8442aa3a2a6009e88d424ff323ac1 +Subproject commit a69f6c251b155dfd40aeacf83a21951cdb298898 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |8 source/text/scalc/01/12050200.xhp | 32 2 files changed, 16 insertions(+), 24 deletions(-) New commits: commit a69f6c251b155dfd40aeacf83a21951cdb298898 Author: Csikós Tamás Date: Fri Jul 19 14:51:11 2013 +0200 update help ids for sub total options page .ui conversion Change-Id: Id89c30fb2393f7c9216f56ffd782ec56b13aab2c Reviewed-on: https://gerrit.libreoffice.org/4984 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index f08d240..bed55ec 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6325,11 +6325,6 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609, sc_CheckBox_RID_SCPAGE_CALC_BTN_LOOKUP,957252627, sc_CheckBox_RID_SCPAGE_CALC_BTN_MATCH,957252626, sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628, -sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_CASE,956810262, -sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_FORMATS,956810273, -sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_PAGEBREAK,956810261, -sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_SORT,956810263, -sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_USERDEF,956810274, sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227, sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228, sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203, @@ -6447,7 +6442,6 @@ sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA,2567507478, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974, -sc_ListBox_RID_SCPAGE_SUBT_OPTIONS_LB_USERDEF,956812835, sc_ListBox_TP_VALIDATION_ERROR_LB_ACTION,548310552, sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762, sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765, @@ -6556,8 +6550,6 @@ sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_DOWN3,956432908, sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP1,956432903, sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP2,956432904, sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP3,956432905, -sc_RadioButton_RID_SCPAGE_SUBT_OPTIONS_BTN_ASCENDING,956809759, -sc_RadioButton_RID_SCPAGE_SUBT_OPTIONS_BTN_DESCENDING,956809760, sc_TabPage_RID_SCPAGE_STAT,957628416, sc_TabPage_TP_VALIDATION_ERROR,548306944, sc_TabPage_TP_VALIDATION_INPUTHELP,548290560, diff --git a/source/text/scalc/01/12050200.xhp b/source/text/scalc/01/12050200.xhp index fb23192..2458889 100644 --- a/source/text/scalc/01/12050200.xhp +++ b/source/text/scalc/01/12050200.xhp @@ -32,27 +32,27 @@ subtotals; sorting options -Options +Options Specify the settings for calculating and presenting subtotals. -Page break between groups -Inserts a new page after each group of subtotaled data. -Case sensitive -Recalculates subtotals when you change the case of a data label. -Pre-sort area according to groups -Sorts the area that you selected in the Group by box of the Group tabs according to the columns that you selected. +Page break between groups +Inserts a new page after each group of subtotaled data. +Case sensitive +Recalculates subtotals when you change the case of a data label. +Pre-sort area according to groups +Sorts the area that you selected in the Group by box of the Group tabs according to the columns that you selected. Sort -Include formats -Considers formatting attributes when sorting. - -Custom sort order -Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists. -Ascending -Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages. -Descending -Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages. +Include formats +Considers formatting attributes when sorting. + +Custom sort order +Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists. +Ascending +Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages. +Descending +Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1
sc/source/ui/dbgui/tpsubt.cxx | 119 ++---
sc/source/ui/inc/subtdlg.hrc| 13 -
sc/source/ui/inc/tpsubt.hxx | 19 +-
sc/source/ui/src/subtdlg.src| 87 --
sc/uiconfig/scalc/ui/subtotaloptionspage.ui | 243
6 files changed, 312 insertions(+), 170 deletions(-)
New commits:
commit 6a5a5c98746a08de078ea05d2973806f7e542928
Author: Csikós Tamás
Date: Fri Jul 19 12:59:45 2013 +0200
modern .ui widgetlayout for subtdlg/subtotaloptions
Change-Id: I05ced583bf342a4a688a7a5bbf1bb9a64ebc711c
Reviewed-on: https://gerrit.libreoffice.org/4983
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index dd6c63e..6164084 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \
sc/uiconfig/scalc/ui/sortwarning \
+ sc/uiconfig/scalc/ui/subtotaloptionspage \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
sc/uiconfig/scalc/ui/tpviewpage \
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index b2a9f9a..36d4f6d 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -464,18 +464,8 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window*
pParent,
const SfxItemSet& rArgSet )
: SfxTabPage ( pParent,
- ScResId( RID_SCPAGE_SUBT_OPTIONS ),
+ "SubTotalOptionsPage",
"modules/scalc/ui/subtotaloptionspage.ui" ,
rArgSet ),
-aFlGroup( this, ScResId( FL_GROUP ) ),
-aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ),
-aBtnCase( this, ScResId( BTN_CASE ) ),
-aBtnSort( this, ScResId( BTN_SORT ) ),
-aFlSort ( this, ScResId( FL_SORT ) ),
-aBtnAscending ( this, ScResId( BTN_ASCENDING ) ),
-aBtnDescending ( this, ScResId( BTN_DESCENDING ) ),
-aBtnFormats ( this, ScResId( BTN_FORMATS ) ),
-aBtnUserDef ( this, ScResId( BTN_USERDEF ) ),
-aLbUserDef ( this, ScResId( LB_USERDEF ) ),
pViewData ( NULL ),
pDoc( NULL ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
@@ -483,11 +473,20 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window*
pParent,
rArgSet.Get( nWhichSubTotals )).
GetSubTotalData() )
{
+get(pBtnPagebreak,"pagebreak");
+get(pBtnCase,"case");
+get(pBtnSort,"sort");
+get(pFlSort,"label2");
+get(pBtnAscending,"ascending");
+get(pBtnDescending,"descending");
+get(pBtnFormats,"formats");
+get(pBtnUserDef,"btnuserdef");
+get(pLbUserDef,"lbuserdef");
+
Init();
-FreeResource();
-aLbUserDef.SetAccessibleRelationLabeledBy(&aBtnUserDef);
-aLbUserDef.SetAccessibleName(aBtnUserDef.GetText());
+pLbUserDef->SetAccessibleRelationLabeledBy(pBtnUserDef);
+pLbUserDef->SetAccessibleName(pBtnUserDef->GetText());
}
// ---
@@ -508,8 +507,8 @@ void ScTpSubTotalOptions::Init()
OSL_ENSURE( pViewData && pDoc, "ViewData oder Document nicht gefunden!" );
-aBtnSort.SetClickHdl( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
-aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
+pBtnSort->SetClickHdl( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
+pBtnUserDef->SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
FillUserSortListBox();
}
@@ -526,27 +525,27 @@ SfxTabPage* ScTpSubTotalOptions::Create( Window*
pParent,
void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
{
-aBtnPagebreak.Check ( rSubTotalData.bPagebreak );
-aBtnCase.Check ( rSubTotalData.bCaseSens );
-aBtnFormats.Check ( rSubTotalData.bIncludePattern );
-aBtnSort.Check ( rSubTotalData.bDoSort );
-aBtnAscending.Check ( rSubTotalData.bAscending );
-aBtnDescending.Check( !rSubTotalData.bAscending );
+pBtnPagebreak->Check ( rSubTotalData.bPagebreak );
+pBtnCase->Check ( rSubTotalData.bCaseSens );
+pBtnFormats->Check ( rSubTotalData.bIncludePattern );
+pBtnSort->Check ( rSubTotalData.bDoSort );
+pBtnAscending->Check ( rSubTotalData.bAscending );
+pBtnDescending->Check( !rSubTotalData.bAscending );
if ( rSubTotalData.bUserDef )
{
-aBtnUserDef.Check( true );
-aLbUserDef.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a5ea771c964f95f050c25d823722fb7355a7eab Author: Csikós Tamás Date: Mon Jul 22 19:12:43 2013 +0200 Updated core Project: help 37a0d37c3d10b63ba377de576619726c794a9a89 update ids for consolidate dialog .ui conversion Change-Id: I92b434dde9361c669d8c6a5cccd9bc74e56aa5cf Reviewed-on: https://gerrit.libreoffice.org/5035 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 338128f..37a0d37 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 338128f5b811d149a77425f446fce25dede18740 +Subproject commit 37a0d37c3d10b63ba377de576619726c794a9a89 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 14 -- source/text/scalc/01/1207.xhp | 28 ++-- source/text/scalc/01/12070100.xhp | 12 ++-- source/text/shared/00/0001.xhp |6 +++--- 4 files changed, 23 insertions(+), 37 deletions(-) New commits: commit 37a0d37c3d10b63ba377de576619726c794a9a89 Author: Csikós Tamás Date: Mon Jul 22 19:12:43 2013 +0200 update ids for consolidate dialog .ui conversion Change-Id: I92b434dde9361c669d8c6a5cccd9bc74e56aa5cf Reviewed-on: https://gerrit.libreoffice.org/5035 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 4fa4157..e08f69e 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6266,9 +6266,6 @@ sc_CheckBox_RID_SCDLG_COL_OPT_BTN_DEFVAL,1494926337, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND1,2568520705, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND2,2568520715, sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND3,2568520725, -sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_BYCOL,2567521332, -sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_BYROW,2567521331, -sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_REFS,2567521341, sc_CheckBox_RID_SCDLG_DBNAMES_BTN_FORMAT,2567324695, sc_CheckBox_RID_SCDLG_DBNAMES_BTN_HEADER,2567324693, sc_CheckBox_RID_SCDLG_DBNAMES_BTN_SIZE,2567324694, @@ -6339,8 +6336,6 @@ sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND2_1,2568521742, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND2_2,2568521745, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND3_1,2568521752, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND3_2,2568521755, -sc_Edit_RID_SCDLG_CONSOLIDATE_ED_DATA_AREA,2567522337, -sc_Edit_RID_SCDLG_CONSOLIDATE_ED_DEST_AREA,2567522347, sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973, sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977, sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971, @@ -6376,8 +6371,6 @@ sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_1,2568531471, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_2,2568531474, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_1,2568531481, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_2,2568531484, -sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DATA_AREA,2567532066, -sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DEST_AREA,2567532076, sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438, sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840, sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689, @@ -6400,9 +6393,6 @@ sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND2_TEMPLATE,2568523284, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_1,2568523286, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_2,2568523287, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_TEMPLATE,2568523294, -sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_DATA_AREA,2567523872, -sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_DEST_AREA,2567523882, -sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_FUNC,2567523852, sc_ListBox_RID_SCDLG_DAPIDATA_LB_DATABASE,1495354899, sc_ListBox_RID_SCDLG_DAPIDATA_LB_OBJTYPE,1495354903, sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505, @@ -6448,7 +6438,6 @@ sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976, sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136, sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816, sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576, -sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060, sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481, sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, @@ -6457,7 +6446,6 @@ sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541, sc_MultiLineEdit_TP_VALIDATION_ERROR_EDT_ERROR,548309529, sc_MultiLineEdit_TP_VALIDATION_INPUTHELP_EDT_INPUTHELP,548293135, sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765, -sc_MultiListBox_RID_SCDLG_CONSOLIDATE_LB_CONSAREAS,2567523350, sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137, sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657, sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931, @@ -6476,8 +6464,6 @@ sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284, -sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_ADD,2567524869, -sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_REMOVE,2567524870, sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259, sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260, sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197, diff --git a/source/text/scalc/01/1207.xhp b/source/text/scalc/01/1207.xhp index f02c208..a52a17d 100644 --- a/source/text/scalc/01/1207.xhp +++ b/source/text/scalc/01/1207.xhp @@ -35,27 +35,27 @@ - + Function -Select the function that you want to use to consolidate the data. - +Select the function that you want to use to consolidate the data. + Consolidation ranges -Displays the cell ranges that you wa
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk|1 sc/UIConfig_scalc.mk |1 sc/inc/sc.hrc|2 sc/source/ui/inc/crnrdlg.hrc | 39 --- sc/source/ui/inc/crnrdlg.hxx | 30 +- sc/source/ui/miscdlgs/crnrdlg.cxx| 373 +++ sc/source/ui/src/crnrdlg.src | 137 --- sc/uiconfig/scalc/ui/namerangesdialog.ui | 345 8 files changed, 546 insertions(+), 382 deletions(-) New commits: commit cc464d66fe3448e54eeef1ea57a78edce4ddc1ac Author: Csikós Tamás Date: Wed Jul 24 14:01:37 2013 +0200 modern .ui widgetlayout for crnrdlg Change-Id: If7e7e18339d50af4a677fcd8ad7d88c5820f6bab Reviewed-on: https://gerrit.libreoffice.org/5064 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 23e1a59..03fd7bd 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -44,7 +44,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/sc.src \ sc/source/ui/src/pseudo.src \ sc/source/ui/src/subtdlg.src \ -sc/source/ui/src/crnrdlg.src \ sc/source/ui/src/hdrcont.src \ sc/source/ui/src/scerrors.src \ sc/source/ui/src/simpref.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index ea74595..3244ea2 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/insertsheet \ sc/uiconfig/scalc/ui/leftfooterdialog \ sc/uiconfig/scalc/ui/leftheaderdialog \ + sc/uiconfig/scalc/ui/namerangesdialog \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/optcalculatepage \ sc/uiconfig/scalc/ui/optchangespage \ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 6df1a87..7ee45d0 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1057,8 +1057,6 @@ #define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109) -#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112) - #define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113) #define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114) diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc deleted file mode 100644 index 9d170c0d..000 --- a/sc/source/ui/inc/crnrdlg.hrc +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "sc.hrc" // -> RID_SCDLG_COLROWNAMERANGES - -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_REMOVE 4 -#define BTN_HELP5 - -#define LB_RANGE11 - -#define FL_ASSIGN 12 -#define ED_AREA 13 -#define RB_AREA 14 -#define BTN_COLHEAD 15 -#define BTN_ROWHEAD 16 -#define ED_DATA 17 -#define RB_DATA 18 -#define FT_DATA_LABEL 19 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 498de19..c2efd2d 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -47,22 +47,20 @@ public: virtual sal_BoolClose(); private: -FixedLine aFlAssign; -ListBox aLbRange; - -formula::RefEditaEdAssign; -formula::RefButton aRbAssign; -RadioButton aBtnColHead; -RadioButton aBtnRowHead; -FixedText aFtAssign2; -formula::RefEditaEdAssign2; -formula::RefButton aRbAssign2; - -OKButtonaBtnOk; -CancelButtonaBtnCancel; -HelpButton aBtnHelp; -PushButton aBtnAdd; -PushButton aBtnRemove; +ListBox* pLbRange; + +formula::RefEdit*pEdAssign; +formula::RefButton* pRbAssign; +RadioButton* pBtnColHead; +RadioButton* pBtnRowHead; +formula::RefEdit*pEdAssign2; +formula::RefButton* pRbAssign2; + +OKButton*pBtnOk; +CancelButton*pBtnCancel; +HelpButton* pB
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 - source/text/scalc/01/04070400.xhp | 22 +++--- source/text/shared/00/0001.xhp |6 +++--- 3 files changed, 14 insertions(+), 23 deletions(-) New commits: commit cb38d01654cbd146be178408e0f3cd4546809291 Author: Csikós Tamás Date: Wed Jul 24 14:22:27 2013 +0200 update ids for name ranges dialog .ui conversion Change-Id: I362bdeb127628ee851e3859af143b290988cce1f Reviewed-on: https://gerrit.libreoffice.org/5067 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e08f69e..6757143 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6328,8 +6328,6 @@ sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_END,1495440898, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_START,1495440897, sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575, -sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_AREA,2568783885, -sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_DATA,2568783889, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND1_1,2568521732, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND1_2,2568521735, sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND2_1,2568521742, @@ -6363,8 +6361,6 @@ sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, sc_FloatingWindow_RID_SCDLG_TEAM,231304704, sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481, sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304, -sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_AREA,2568793614, -sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_DATA,2568793618, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND1_1,2568531461, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND1_2,2568531464, sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_1,2568531471, @@ -6383,7 +6379,6 @@ sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289, sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291, sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290, sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257, -sc_ListBox_RID_SCDLG_COLROWNAMERANGES_LB_RANGE,2568785419, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_1,2568523266, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_2,2568523267, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_TEMPLATE,2568523274, @@ -6455,8 +6450,6 @@ sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735, sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732, sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385, sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_REMOVE,1493537386, -sc_PushButton_RID_SCDLG_COLROWNAMERANGES_BTN_ADD,2568786435, -sc_PushButton_RID_SCDLG_COLROWNAMERANGES_BTN_REMOVE,2568786436, sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND1_NEW,2568524322, sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND2_NEW,2568524323, sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND3_NEW,2568524324, @@ -6477,8 +6470,6 @@ sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324, sc_PushButton_TP_VALIDATION_ERROR_BTN_SEARCH,548311578, sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_COLS,1494368769, sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_ROWS,1494368771, -sc_RadioButton_RID_SCDLG_COLROWNAMERANGES_BTN_COLHEAD,2568782351, -sc_RadioButton_RID_SCDLG_COLROWNAMERANGES_BTN_ROWHEAD,2568782352, sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOEND,1495433731, sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOSTART,1495433729, sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_MANEND,1495433732, diff --git a/source/text/scalc/01/04070400.xhp b/source/text/scalc/01/04070400.xhp index 3bce811..40af002 100644 --- a/source/text/scalc/01/04070400.xhp +++ b/source/text/scalc/01/04070400.xhp @@ -42,24 +42,24 @@ The cell contents of a label range can be used like names in formulas - $[officename] recognizes these names in the same manner that it does the predefined names of the weekdays and months. These names are automatically completed when typed into a formula. In addition, the names defined by label ranges will have priority over names defined by automatically generated ranges. You can set label ranges that contain the same labels on different sheets. $[officename] first searches the label ranges of the current sheet and, following a failed search, the ranges of other sheets. - - + + Range -Displays the cell reference of each label range. In order to remove a label range from the list box, select it and then click Delete. +Displays the cell reference of each label range. In order to remove a label range from the list box, select it and then click Delete. - + Contains column labels -Includes column labels in the current label range. - +Includes column labels in the current label range. + Contains row labels -Includes row labels in the current label range. - +Includes row labels in the current label range. + For data range -Sets the data range for which the selected label range is valid. To modify it, click in the sheet and select another range with the mouse. +Sets the data range for which the selected label range is valid. To modify it, click in the sheet and select an
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0cdace6b4e16198baf7b66c9c6359a8a13d6ff62 Author: Csikós Tamás Date: Wed Jul 24 14:22:27 2013 +0200 Updated core Project: help cb38d01654cbd146be178408e0f3cd4546809291 update ids for name ranges dialog .ui conversion Change-Id: I362bdeb127628ee851e3859af143b290988cce1f Reviewed-on: https://gerrit.libreoffice.org/5067 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 8444a38..cb38d01 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8444a38a2cd2220b6f0b317e3251ad69da2e2a3e +Subproject commit cb38d01654cbd146be178408e0f3cd4546809291 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig starmath/uiconfig
sc/source/ui/miscdlgs/mvtabdlg.cxx|5 +
sc/uiconfig/scalc/ui/movecopysheet.ui |4 +++-
starmath/uiconfig/smath/ui/alignmentdialog.ui |1 -
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 9a44e90c2c5c19fb310298ed525c2b77f49c97b8
Author: Csikós Tamás
Date: Thu Jul 25 17:56:47 2013 +0200
minor updates
alignmentdialog.ui - The default button's text was aligned to the right
mvtabdlg.cc - the warning text doesn't occupy the space, when there is no
warning
movecopysheet.ui - top alignment set to 6, radiobuttons aligned horizontally
Change-Id: I5c3fbc512292917a2f4297e164fce73c56a124f3
Reviewed-on: https://gerrit.libreoffice.org/5110
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx
b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index c3f0153..2dff426 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -157,6 +157,7 @@ void ScMoveTableDlg::CheckNewTabName()
if (aNewName.isEmpty())
{
// New sheet name is empty. This is not good.
+pFtWarn->Show(sal_True);
pFtWarn->SetControlBackground(Color(COL_YELLOW));
pFtWarn->SetText(msStrTabNameEmpty);
pBtnOk->Disable();
@@ -166,6 +167,7 @@ void ScMoveTableDlg::CheckNewTabName()
if (!ScDocument::ValidTabName(aNewName))
{
// New sheet name contains invalid characters.
+pFtWarn->Show(sal_True);
pFtWarn->SetControlBackground(Color(COL_YELLOW));
pFtWarn->SetText(msStrTabNameInvalid);
pBtnOk->Disable();
@@ -187,12 +189,14 @@ void ScMoveTableDlg::CheckNewTabName()
if ( bFound )
{
+pFtWarn->Show(sal_True);
pFtWarn->SetControlBackground(Color(COL_YELLOW));
pFtWarn->SetText(msStrTabNameUsed);
pBtnOk->Disable();
}
else
{
+pFtWarn->Hide(sal_True);
pFtWarn->SetControlBackground();
pFtWarn->SetText(OUString());
pBtnOk->Enable();
@@ -221,6 +225,7 @@ void ScMoveTableDlg::Init()
pBtnMove->Check( true );
pBtnCopy->Check( false );
pEdTabName->Enable(false);
+pFtWarn->Hide(sal_True);
InitDocListBox();
SelHdl( pLbDoc );
}
diff --git a/sc/uiconfig/scalc/ui/movecopysheet.ui
b/sc/uiconfig/scalc/ui/movecopysheet.ui
index 28f0a8c..47b0bad 100644
--- a/sc/uiconfig/scalc/ui/movecopysheet.ui
+++ b/sc/uiconfig/scalc/ui/movecopysheet.ui
@@ -78,18 +78,19 @@
True
False
+6
12
True
False
-vertical
_Move
True
True
False
+True
True
0
True
@@ -108,6 +109,7 @@
True
True
False
+True
True
0
True
diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui
b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index 7368f21..e0b4fed 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
@@ -66,7 +66,6 @@
True
True
True
-right
False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source svtools/source
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/directsql.cxx | 66 ++---
dbaccess/source/ui/inc/directsql.hxx | 18 -
dbaccess/uiconfig/ui/directsqldialog.ui| 277 +
extras/source/glade/libreoffice-catalog.xml.in |6
svtools/source/edit/editsyntaxhighlighter.cxx |6
svtools/source/edit/svmedit.cxx|6
7 files changed, 330 insertions(+), 50 deletions(-)
New commits:
commit 471e5c1ed19afde8a92a91bfc1ccc71a2506cc01
Author: Csikós Tamás
Date: Mon Jul 29 19:54:43 2013 +0200
modern .ui widgetlayout for directsql
Change-Id: I51140fe6abd2d321c5784b923f920ab9183f417e
Reviewed-on: https://gerrit.libreoffice.org/5171
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index eb97972..cace6a8 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,dbaccess))
$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
+dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/generalpagedialog \
dbaccess/uiconfig/ui/generalpagewizard \
diff --git a/dbaccess/source/ui/dlg/directsql.cxx
b/dbaccess/source/ui/dlg/directsql.cxx
index bb73d8a..87b9173 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -73,33 +73,25 @@ namespace dbaui
DBG_NAME(DirectSQLDialog)
//
DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference<
XConnection >& _rxConn )
-:ModalDialog(_pParent, ModuleRes(DLG_DIRECTSQL))
-,m_aFrame (this, ModuleRes(FL_SQL))
-,m_aSQLLabel(this, ModuleRes(FT_SQL))
-,m_aSQL (this, ModuleRes(ME_SQL))
-,m_aExecute (this, ModuleRes(PB_EXECUTE))
-,m_aHistoryLabel(this, ModuleRes(FT_HISTORY))
-,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY)))
-,m_aStatusFrame (this, ModuleRes(FL_STATUS))
-,m_aStatus (this, ModuleRes(ME_STATUS))
-,m_pShowOutput(new CheckBox(this, ModuleRes(CB_SHOWOUTPUT)))
-,m_aOutputFrame (this, ModuleRes(FL_OUTPUT))
-,m_aOutput (this, ModuleRes(ME_OUTPUT))
-,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS))
-,m_aHelp(this, ModuleRes(PB_HELP))
-,m_aClose (this, ModuleRes(PB_CLOSE))
+:ModalDialog(_pParent, "DirectSQLDialog" ,
"dbaccess/ui/directsqldialog.ui")
,m_nHistoryLimit(20)
,m_nStatusCount(1)
,m_xConnection(_rxConn)
{
-DBG_CTOR(DirectSQLDialog,NULL);
+get(m_pSQL,"sql");
+get(m_pExecute,"execute");
+get(m_pSQLHistory,"sqlhistory");
+get(m_pStatus,"status");
+get(m_pShowOutput,"showoutput");
+get(m_pOutput,"output");
+get(m_pClose,"close");
-FreeResource();
+DBG_CTOR(DirectSQLDialog,NULL);
-m_aSQL.GrabFocus();
+m_pSQL->GrabFocus();
-m_aExecute.SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
-m_aClose.SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
+m_pExecute->SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
+m_pClose->SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
m_pSQLHistory->SetSelectHdl(LINK(this, DirectSQLDialog,
OnListEntrySelected));
m_pSQLHistory->SetDropDownLineCount(10);
@@ -109,8 +101,8 @@ DBG_NAME(DirectSQLDialog)
if (xConnComp.is())
startComponentListening(xConnComp);
-m_aSQL.SetModifyHdl(LINK(this, DirectSQLDialog, OnStatementModified));
-OnStatementModified(&m_aSQL);
+m_pSQL->SetModifyHdl(LINK(this, DirectSQLDialog, OnStatementModified));
+OnStatementModified(m_pSQL);
}
//
@@ -120,8 +112,6 @@ DBG_NAME(DirectSQLDialog)
::osl::MutexGuard aGuard(m_aMutex);
stopAllComponentListening();
}
-delete m_pSQLHistory;
-delete m_pShowOutput;
DBG_DTOR(DirectSQLDialog,NULL);
}
@@ -226,7 +216,7 @@ DBG_NAME(DirectSQLDialog)
OSL_ENSURE(xStatement.is(),
"DirectSQLDialog::implExecuteStatement: no statement returned by the
connection!");
// clear the output box
-m_aOutput.SetText(OUString());
+m_pOutput->SetText(OUString());
if (xStatement.is())
{
if
(OUString(_rStatement).toAsciiUpperCase().startsWith("SELECT") &&
m_pShowOutput->IsChecked())
@@ -288,10 +278,10 @@ DBG_NAME(DirectSQLDialog)
{
OUString sAppendMessage = OUString::n
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a078da0841f3e49831653f29696df0b717e674d6 Author: Csikós Tamás Date: Tue Jul 30 20:56:31 2013 +0200 Updated core Project: help 49dbfd092b55cab53b632980ad79fd6c24d7c99b update help ids for direct sql dialog .ui conversion Change-Id: I04405deaa3af2deb89d41ea032dc95b0fb5f919f Reviewed-on: https://gerrit.libreoffice.org/5205 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 8c5b41a..49dbfd0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8c5b41a85329a9677733546d16a097860bd28058 +Subproject commit 49dbfd092b55cab53b632980ad79fd6c24d7c99b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/explorer/database/1108.xhp | 16 2 files changed, 8 insertions(+), 14 deletions(-) New commits: commit 49dbfd092b55cab53b632980ad79fd6c24d7c99b Author: Csikós Tamás Date: Tue Jul 30 20:56:31 2013 +0200 update help ids for direct sql dialog .ui conversion Change-Id: I04405deaa3af2deb89d41ea032dc95b0fb5f919f Reviewed-on: https://gerrit.libreoffice.org/5205 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 9d05cd9..618fa40 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5945,7 +5945,6 @@ dbaccess_ListBox_DLG_ADABASSTAT_LB_DATADEVS,1388613121, dbaccess_ListBox_DLG_DATASOURCE_SELECTION_LB_DATASOURCE,1388383745, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_FREEINDEXES,1388334594, dbaccess_ListBox_DLG_DBASE_INDEXES_LB_TABLEINDEXES,1388334593, -dbaccess_ListBox_DLG_DIRECTSQL_LB_HISTORY,1388678662, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP1,1388416514, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP2,1388416516, dbaccess_ListBox_DLG_FILTERCRIT_LB_WHERECOMP3,1388416518, @@ -5967,7 +5966,6 @@ dbaccess_MetricField_DLG_ROWHEIGHT_MF_VALUE,1388452353, dbaccess_ModalDialog_DLG_ADABASSTAT,1388609536, dbaccess_ModalDialog_DLG_DATASOURCE_SELECTION,1388380160, dbaccess_ModalDialog_DLG_DBASE_INDEXES,1388331008, -dbaccess_ModalDialog_DLG_DIRECTSQL,1388675072, dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920, dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, @@ -5976,8 +5974,6 @@ dbaccess_ModalDialog_DLG_REL_PROPERTIES,1388593152, dbaccess_ModalDialog_DLG_SQLEXCEPTIONCHAIN,1388363776, dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528, dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768, -dbaccess_MultiLineEdit_DLG_DIRECTSQL_ME_SQL,1388677635, -dbaccess_MultiLineEdit_DLG_DIRECTSQL_ME_STATUS,1388677640, dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES,851495426, dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_NEW_COLUMN_NAMES,851594242, dbaccess_MultiListBox_TAB_WIZ_COLUMN_SELECT_LB_ORG_COLUMN_NAMES,851594241, @@ -5990,8 +5986,6 @@ dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697, dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603, dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_CREATE,1388384777, dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_MANAGE,1388384773, -dbaccess_PushButton_DLG_DIRECTSQL_PB_CLOSE,1388679691, -dbaccess_PushButton_DLG_DIRECTSQL_PB_EXECUTE,1388679684, dbaccess_PushButton_DLG_INDEXDESIGN_PB_CLOSE,1388630529, dbaccess_PushButton_DLG_JOIN_TABADD_PB_ADDTABLE,2462290433, dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158, diff --git a/source/text/shared/explorer/database/1108.xhp b/source/text/shared/explorer/database/1108.xhp index d84778c..63c9912 100644 --- a/source/text/shared/explorer/database/1108.xhp +++ b/source/text/shared/explorer/database/1108.xhp @@ -41,17 +41,17 @@ You can only enter administration commands in this dialog, such as Grant, Create Table, or Drop Table, and not filter commands. The commands that you can enter depend on the data source, for example, dBASE can only run some of the SQL commands list here. To run an SQL query for filtering data in the database, use the Query Design View. -Command to execute -Enter the SQL administration command that you want to run. +Command to execute +Enter the SQL administration command that you want to run. For example, for a "Bibliography" data source, you can enter the following SQL command: SELECT "Address" FROM "biblio" "biblio" For more information on SQL commands, please consult the documentation that came with the database. -Previous commands -Lists the previously executed SQL commands. To run a command again, click the command, and then click Run. -Status -Displays the results, including errors, of the SQL command that you ran. -Run -Runs the command that you entered in the Command to execute box. +Previous commands +Lists the previously executed SQL commands. To run a command again, click the command, and then click Run. +Status +Displays the results, including errors, of the SQL command that you ran. +Run +Runs the command that you entered in the Command to execute box. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/inc reportdesign/source reportdesign/uiconfig reportdesign/UIConfig_dbreport.mk
reportdesign/UIConfig_dbreport.mk |3
reportdesign/inc/RptResId.hrc |1
reportdesign/source/ui/dlg/PageNumber.cxx | 35 -
reportdesign/source/ui/dlg/PageNumber.hrc | 53 --
reportdesign/source/ui/dlg/PageNumber.src | 123 --
reportdesign/source/ui/inc/PageNumber.hxx | 24 -
reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui | 341 ++
7 files changed, 366 insertions(+), 214 deletions(-)
New commits:
commit fbf0988d22248b8098a7645b55db383070961b99
Author: Csikós Tamás
Date: Wed Jul 31 11:29:47 2013 +0200
modern .ui widgetlayout for pagenumber
widget found at: database/insert/report -> insert/page numbers
Change-Id: Ibc0336a5a61cea44451e9a30b7dba5666dbc0fed
Reviewed-on: https://gerrit.libreoffice.org/5211
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/reportdesign/UIConfig_dbreport.mk
b/reportdesign/UIConfig_dbreport.mk
index 45e43b3..3ede087 100644
--- a/reportdesign/UIConfig_dbreport.mk
+++ b/reportdesign/UIConfig_dbreport.mk
@@ -34,4 +34,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbreport,\
reportdesign/uiconfig/dbreport/toolbar/toolbar \
))
+$(eval $(call gb_UIConfig_add_uifiles,modules/dbreport,\
+ reportdesign/uiconfig/dbreport/ui/pagenumberdialog \
+))
# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index ed80f79..8569863 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -39,7 +39,6 @@
// Dialog Control Id's
---
#define RID_GROUPS_SORTING ( RID_DIALOG_START + 0 )
-#define RID_PAGENUMBERS ( RID_DIALOG_START + 1 )
#define RID_DATETIME_DLG( RID_DIALOG_START + 2 )
#define RID_CONDFORMAT ( RID_DIALOG_START + 3 )
#define WIN_CONDITION ( RID_DIALOG_START + 4 )
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx
b/reportdesign/source/ui/dlg/PageNumber.cxx
index 42bd2f2..1465e32 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "PageNumber.hxx"
-#include "PageNumber.hrc"
#include
#include
#include "RptResId.hrc"
@@ -44,29 +43,21 @@ DBG_NAME( rpt_OPageNumberDialog )
OPageNumberDialog::OPageNumberDialog( Window* _pParent
,const uno::Reference<
report::XReportDefinition >& _xHoldAlive
,OReportController* _pController)
-: ModalDialog( _pParent, ModuleRes(RID_PAGENUMBERS) )
-,m_aFormat(this, ModuleRes(FL_FORMAT) )
-,m_aPageN(this, ModuleRes(RB_PAGE_N) )
-,m_aPageNofM(this, ModuleRes(RB_PAGE_N_OF_M) )
-,m_aPosition(this, ModuleRes(FL_POSITION) )
-,m_aTopPage(this, ModuleRes(RB_PAGE_TOPPAGE) )
-,m_aBottomPage(this, ModuleRes(RB_PAGE_BOTTOMPAGE) )
-,m_aMisc(this, ModuleRes(FL_MISC) )
-,m_aAlignment(this, ModuleRes(FL_ALIGNMENT) )
-,m_aAlignmentLst(this, ModuleRes(LST_ALIGNMENT) )
-,m_aShowNumberOnFirstPage(this, ModuleRes(CB_SHOWNUMBERONFIRSTPAGE) )
-,m_aFl1(this, ModuleRes(FL_SEPARATOR1))
-,m_aPB_OK(this, ModuleRes(PB_OK))
-,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL))
-,m_aPB_Help(this, ModuleRes(PB_HELP))
+: ModalDialog( _pParent, "PageNumberDialog" ,
"modules/dbreport/ui/pagenumberdialog.ui" )
,m_pController(_pController)
,m_xHoldAlive(_xHoldAlive)
{
+get(m_pPageN,"pagen");
+get(m_pPageNofM,"pagenofm");
+get(m_pTopPage,"toppage");
+get(m_pBottomPage,"bottompage");
+get(m_pAlignmentLst,"alignment");
+get(m_pShowNumberOnFirstPage,"shownumberonfirstpage");
+
DBG_CTOR( rpt_OPageNumberDialog,NULL);
-m_aShowNumberOnFirstPage.Hide();
+m_pShowNumberOnFirstPage->Hide();
-FreeResource();
}
//
@@ -86,7 +77,7 @@ short OPageNumberDialog::Execute()
sal_Int32 nPosX = 0;
sal_Int32 nPos2X = 0;
awt::Size aRptSize =
getStyleProperty(m_xHoldAlive,PROPERTY_PAPERSIZE);
-switch ( m_aAlignmentLst.GetSelectEntryPos() )
+switch ( m_pAlignmentLst->GetSelectEntryPos() )
{
case 0: // left
nPosX =
getStyleProperty(m_xHoldAlive,PROPERTY_LEFTMARGIN);
@@ -105,7 +96,7 @@ short OPageNumberDialog::Execute()
default:
break;
}
-if ( m_aAlignmentLst.GetSelectEntryPos() > 2 )
+if ( m_pAlignmentLst->GetSelectEntryPos() > 2 )
nPosX = nPos2X;
sal_Int32 nLength = 0;
@@ -114,10 +105,10 @@ short OPageNumberDialog::Execute()
aV
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/explorer/database/rep_pagenumbers.xhp | 10 +- 2 files changed, 5 insertions(+), 11 deletions(-) New commits: commit 6d653a9f5a8f4bf28f6168ca995fd52579b87f10 Author: Csikós Tamás Date: Wed Jul 31 12:28:55 2013 +0200 update help ids for page number dialog .ui conversion Change-Id: Id74ac417c50d32c0edb3e78330450fabc2b510ea Reviewed-on: https://gerrit.libreoffice.org/5212 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index d97b164..e3284fd 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6226,7 +6226,6 @@ framework_PushButton_DLG_LICENSE_PB_DECLINE,1077940758, framework_PushButton_DLG_LICENSE_PB_PAGEDOWN,1077940754, reportdesign_CheckBox_RID_DATETIME_DLG_CB_DATE,1577878529, reportdesign_CheckBox_RID_DATETIME_DLG_CB_TIME,1577878533, -reportdesign_CheckBox_RID_PAGENUMBERS_CB_SHOWNUMBERONFIRSTPAGE,1577862153, reportdesign_ListBox_RID_DATETIME_DLG_LB_DATE_TYPE,1577881091, reportdesign_ListBox_RID_DATETIME_DLG_LB_TIME_TYPE,1577881095, reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236, @@ -6234,12 +6233,7 @@ reportdesign_ListBox_RID_GROUPS_SORTING_LST_GROUPONLST,2114719238, reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234, reportdesign_ListBox_RID_GROUPS_SORTING_LST_KEEPTOGETHERLST,2114719242, reportdesign_ListBox_RID_GROUPS_SORTING_LST_ORDER,2114719249, -reportdesign_ListBox_RID_PAGENUMBERS_LST_ALIGNMENT,1577864712, reportdesign_NumericField_RID_GROUPS_SORTING_ED_GROUPINTERVALLST,2114721800, -reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_BOTTOMPAGE,1577861638, -reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_N,1577861634, -reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_N_OF_M,1577861635, -reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_TOPPAGE,1577861637, sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ADJUST,1493533722, sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ALIGNMENT,1493533721, sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_BORDER,1493533717, diff --git a/source/text/shared/explorer/database/rep_pagenumbers.xhp b/source/text/shared/explorer/database/rep_pagenumbers.xhp index ac11530..8adf80b 100644 --- a/source/text/shared/explorer/database/rep_pagenumbers.xhp +++ b/source/text/shared/explorer/database/rep_pagenumbers.xhp @@ -33,11 +33,11 @@ You can open the Page Numbers dialog of the Report Builder by choosing Insert - Page Numbers. Press Shift-F1 and point with the mouse at an input box to see a help text for this input box. -Page N -Page N of M -Top of Page (Header) -Bottom of Page (Footer) -AlignmentShow Number On First Page - not in UIShow Number on First Page +Page N +Page N of M +Top of Page (Header) +Bottom of Page (Footer) +AlignmentShow Number On First Page - not in UIShow Number on First Page Select the format for the page numbers, either "Page N" or "Page N of M", where N stands for the current page number, and M for the total number of pages in the report. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 934d3c7a2e6971c48c2385a346b0ac5fed39d842 Author: Csikós Tamás Date: Wed Jul 31 12:28:55 2013 +0200 Updated core Project: help 6d653a9f5a8f4bf28f6168ca995fd52579b87f10 update help ids for page number dialog .ui conversion Change-Id: Id74ac417c50d32c0edb3e78330450fabc2b510ea Reviewed-on: https://gerrit.libreoffice.org/5212 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index b3408bc..6d653a9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b3408bc3c60ddee2eac3dce5a04d596da328528f +Subproject commit 6d653a9f5a8f4bf28f6168ca995fd52579b87f10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/source/ui/dialog/regionsw.hrc | 22
sw/source/ui/dialog/regionsw.src | 205
sw/source/ui/dialog/uiregionsw.cxx | 180 +++
sw/source/ui/inc/regionsw.hxx | 52 +-
sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui | 515 +
6 files changed, 630 insertions(+), 345 deletions(-)
New commits:
commit fd628da9e34d7fb25e2ab7606d80509c3e651a1b
Author: Csikós Tamás
Date: Wed Jul 31 17:18:57 2013 +0200
modern .ui widgetlayout for uiregionsw
widget found at: writer/insert/section -> footnotes/endnotes
Conflicts:
sw/source/ui/dialog/regionsw.src
Change-Id: Ie3f24eeb63f334dd8db9fce4bc2762b1927e58f9
Reviewed-on: https://gerrit.libreoffice.org/5221
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 0e3f9ee..d259830 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footendnotedialog \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
+ sw/uiconfig/swriter/ui/footnotesendnotestabpage \
sw/uiconfig/swriter/ui/frmaddpage \
sw/uiconfig/swriter/ui/frmurlpage \
sw/uiconfig/swriter/ui/indexentry \
diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc
index 620382a..8d79cbe 100644
--- a/sw/source/ui/dialog/regionsw.hrc
+++ b/sw/source/ui/dialog/regionsw.hrc
@@ -24,38 +24,18 @@
#define CB_DDE 1
#define CB_DISMISS 2
-#define CB_END_AT_TXTEND3
-#define CB_END_NUM 4
#define CB_FILE 5
-#define CB_FTN_AT_TXTEND6
-#define CB_FTN_NUM 7
#define CB_HIDE 8
#define CB_PASSWD 9
#define CB_PROTECT 10
-#define CB_FTN_NUM_FMT 11
-#define CB_END_NUM_FMT 12
#define ED_CONDITION 13
-#define ED_END_PREFIX 14
-#define ED_END_SUFFIX 15
#define ED_FILE16
-#define ED_FTN_PREFIX 17
-#define ED_FTN_SUFFIX 18
#define ED_RANAME 19
#define ED_RNAME 20
#define FT_CONDITION 21
-#define FLD_END_OFFSET 23
-#define FLD_FTN_OFFSET 24
#define FT_DDE 25
-#define FT_END_OFFSET 26
-#define FT_END_PREFIX 27
-#define FT_END_SUFFIX 28
#define FT_FILE29
-#define FT_FTN_OFFSET 30
-#define FT_FTN_PREFIX 31
-#define FT_FTN_SUFFIX 32
#define FT_SUBREG 34
-#define LB_END_NUMVIEW 36
-#define LB_FTN_NUMVIEW 37
#define LB_SUBREG 38
#define PB_CANCEL 39
#define PB_FILE40
@@ -69,8 +49,6 @@
#define FL_PROTECT 49
#define FL_HIDE50
#define PB_PASSWD 51
-#define FL_END 52
-#define FL_FTN 53
#define IL_BITMAPS 54
// #114856# edit in readonly sections
#define FL_PROPERTIES 56
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index ec820ad..a652597 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -380,209 +380,4 @@ TabDialog DLG_SECTION_PROPERTIES
Text [ en-US ] = "Options";
};
-
-TabPage TP_SECTION_FTNENDNOTES
-{
-HelpID = HID_SECTION_FTNENDNOTES_PAGE;
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Hide = TRUE ;
-FixedLine FL_FTN
-{
-OutputSize = TRUE ;
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = "Footnotes";
-};
-CheckBox CB_FTN_AT_TXTEND
-{
-HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND";
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 90 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "Collec~t at end of text";
-
-};
-CheckBox CB_FTN_NUM
-{
-HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM";
-Pos = MAP_APPFONT ( 18 , 29 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "~Restart numbering";
-};
-FixedText FT_FTN_OFFSET
-{
-Pos = MAP_APPFONT ( 24 , 46 ) ;
-Size = MAP_APPFONT ( 64 , 8 ) ;
-Left = TRUE ;
-Text [ en-US ] = "~Start at" ;
-};
-NumericField FLD_FTN_OFFSET
-{
-HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET";
-Pos = MAP_APPFONT ( 90 , 44 ) ;
-Size = MAP_APPFONT ( 30 , 12 ) ;
-Spin = TRUE ;
-Minimum = 1 ;
-First = 1 ;
-Last =
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst| 14 - source/text/swriter/01/05040700.xhp | 56 ++-- 2 files changed, 28 insertions(+), 42 deletions(-) New commits: commit 7cac382748b5c5ade0e6df66da99a8069673b3b2 Author: Csikós Tamás Date: Wed Jul 31 17:57:56 2013 +0200 update help ids for footnotes endnotes tab page .ui conversion Change-Id: Ia4a156a966172f388d0f7cc08521ef5a53ebde14 Reviewed-on: https://gerrit.libreoffice.org/5222 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e3284fd..eca4e7a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -7610,12 +7610,6 @@ sw_CheckBox_TP_OPTSHDWCRSR_CB_SHDWCRSONOFF,878806018, sw_CheckBox_TP_OPTSHDWCRSR_CB_SHYPH,878806025, sw_CheckBox_TP_OPTSHDWCRSR_CB_SPACE,878806023, sw_CheckBox_TP_OPTSHDWCRSR_CB_TAB,878806022, -sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_AT_TXTEND,879248387, -sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_NUM,879248388, -sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_NUM_FMT,879248396, -sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_AT_TXTEND,879248390, -sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_NUM,879248391, -sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_NUM_FMT,879248395, sw_CheckBox_TP_TABLE_COLUMN_CB_MOD_TBL,888489082, sw_CheckBox_TP_TABLE_COLUMN_CB_PROP,888489083, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_HEADLINE,878511144, @@ -7721,10 +7715,6 @@ sw_Edit_TP_PRIVATE_DATA_ED_STREET,879216676, sw_Edit_TP_PRIVATE_DATA_ED_TITLE,879216684, sw_Edit_TP_PRIVATE_DATA_ED_WWW,879216691, sw_Edit_TP_PRIVATE_DATA_ED_ZIP,879216678, -sw_Edit_TP_SECTION_FTNENDNOTES_ED_END_PREFIX,879249422, -sw_Edit_TP_SECTION_FTNENDNOTES_ED_END_SUFFIX,879249423, -sw_Edit_TP_SECTION_FTNENDNOTES_ED_FTN_PREFIX,879249425, -sw_Edit_TP_SECTION_FTNENDNOTES_ED_FTN_SUFFIX,879249426, sw_Edit_TP_TOX_SELECT_ED_TITLE,879134735, sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800, sw_FT_BODY_DLG_MM_MAILBODY,1435402240, @@ -7832,8 +7822,6 @@ sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE,878939676, sw_ListBox_TP_OPTCAPTION_PAGE_LB_LEVEL,878939671, sw_ListBox_TP_OPTCAPTION_PAGE_LB_ORDER,878939680, sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260, -sw_ListBox_TP_SECTION_FTNENDNOTES_LB_END_NUMVIEW,879250980, -sw_ListBox_TP_SECTION_FTNENDNOTES_LB_FTN_NUMVIEW,879250981, sw_ListBox_TP_TABLE_TEXTFLOW_LB_PAGECOLL,878513801, sw_ListBox_TP_TABLE_TEXTFLOW_LB_TEXTORIENTATION,878513708, sw_ListBox_TP_TABLE_TEXTFLOW_LB_VERTORIENT,878513815, @@ -7934,8 +7922,6 @@ sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073, sw_NumericField_TP_LINENUMBERING_NF_NUM_INVERVAL,878893067, sw_NumericField_TP_NUMPARA_NF_NEW_START,878860294, sw_NumericField_TP_NUMPARA_NF_RESTART_PARA,878860299, -sw_NumericField_TP_SECTION_FTNENDNOTES_FLD_END_OFFSET,879253527, -sw_NumericField_TP_SECTION_FTNENDNOTES_FLD_FTN_OFFSET,879253528, sw_NumericField_TP_TABLE_TEXTFLOW_NF_PAGENUM,878516363, sw_NumericField_TP_TABLE_TEXTFLOW_NF_REPEAT_HEADER,878516264, sw_NumericField_TP_TOX_ENTRY_NF_LEVEL_OL,879155353, diff --git a/source/text/swriter/01/05040700.xhp b/source/text/swriter/01/05040700.xhp index 6ebf929..8ded371 100644 --- a/source/text/swriter/01/05040700.xhp +++ b/source/text/swriter/01/05040700.xhp @@ -41,35 +41,35 @@ This tab is not available in Print Layout view. Footnotes - Collect at end of text - Adds footnotes at the end of the section. If the section spans more than one page, the footnotes are added to the bottom of the page on which the footnote anchors appear. - Restart numbering - Restarts the footnote numbering at the number that you specify. - Start at - Enter the number that you want to assign the footnote. - Custom format - Specifies a custom numbering format for footnotes. This check box is only available if the Restart numbering check box is selected. - Before - Enter the text that you want to display in front of the footnote number. - Spin button own format - Select the numbering style for the footnotes. - After - Enter the text that you want to display after the footnote number. + Collect at end of text + Adds footnotes at the end of the section. If the section spans more than one page, the footnotes are added to the bottom of the page on which the footnote anchors appear. + Restart numbering + Restarts the footnote numbering at the number that you specify. + Start at + Enter the number that you want to assign the footnote. + Custom format + Specifies a custom numbering format for footnotes. This check box is only available if the Restart numbering check box is selected. + Before + Enter the text that you want to display in front of the footnote number. + Spin button own format + Select the numbering style for the footnotes. + After + Enter the text that you want to display after the footnote number. Endnotes - Collect at end of section - Adds endnotes at the end of the section. - Res
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a1755a4e8b171c616aeec0db86c8e6cf07d018e Author: Csikós Tamás Date: Wed Jul 31 17:57:56 2013 +0200 Updated core Project: help 7cac382748b5c5ade0e6df66da99a8069673b3b2 update help ids for footnotes endnotes tab page .ui conversion Change-Id: Ia4a156a966172f388d0f7cc08521ef5a53ebde14 Reviewed-on: https://gerrit.libreoffice.org/5222 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index a33c7f1..7cac382 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a33c7f18d600d08e5bf1cff321ed914ee76761b8 +Subproject commit 7cac382748b5c5ade0e6df66da99a8069673b3b2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/AllLangResTarget_rptui.mk reportdesign/source reportdesign/uiconfig reportdesign/UIConfig_dbreport.mk
reportdesign/AllLangResTarget_rptui.mk |1
reportdesign/UIConfig_dbreport.mk |1
reportdesign/source/ui/dlg/DateTime.cxx | 70 +++
reportdesign/source/ui/dlg/DateTime.hrc | 49 -
reportdesign/source/ui/dlg/DateTime.src | 126 -
reportdesign/source/ui/inc/DateTime.hxx | 20 --
reportdesign/uiconfig/dbreport/ui/datetimedialog.ui | 193
7 files changed, 236 insertions(+), 224 deletions(-)
New commits:
commit 1f0da38c7d132cfc64e977454ebc2eab35f18ba0
Author: Csikós Tamás
Date: Wed Jul 31 13:37:41 2013 +0200
modern .ui widgetlayout for datetime
widget found at: database/insert/report -> insert/Date and Time
Change-Id: I8d0f388bd8e3eb7169e24570beeb7d6b513b8d05
Reviewed-on: https://gerrit.libreoffice.org/5213
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/reportdesign/AllLangResTarget_rptui.mk
b/reportdesign/AllLangResTarget_rptui.mk
index 7997d02..c913f7e 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
$(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
reportdesign/source/ui/dlg/dlgpage.src \
reportdesign/source/ui/dlg/PageNumber.src \
- reportdesign/source/ui/dlg/DateTime.src \
reportdesign/source/ui/dlg/CondFormat.src \
reportdesign/source/ui/dlg/Navigator.src\
reportdesign/source/ui/dlg/GroupsSorting.src \
diff --git a/reportdesign/UIConfig_dbreport.mk
b/reportdesign/UIConfig_dbreport.mk
index 3ede087..e8c6904 100644
--- a/reportdesign/UIConfig_dbreport.mk
+++ b/reportdesign/UIConfig_dbreport.mk
@@ -36,5 +36,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbreport,\
$(eval $(call gb_UIConfig_add_uifiles,modules/dbreport,\
reportdesign/uiconfig/dbreport/ui/pagenumberdialog \
+ reportdesign/uiconfig/dbreport/ui/datetimedialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx
b/reportdesign/source/ui/dlg/DateTime.cxx
index 5ad27ab..fecfb0b 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "DateTime.hxx"
-#include "DateTime.hrc"
#include
#include
#include "RptResId.hrc"
@@ -52,23 +51,21 @@ DBG_NAME( rpt_ODateTimeDialog )
ODateTimeDialog::ODateTimeDialog( Window* _pParent
,const uno::Reference<
report::XSection >& _xHoldAlive
,OReportController* _pController)
-: ModalDialog( _pParent, ModuleRes(RID_DATETIME_DLG) )
-,m_aDate(this, ModuleRes(CB_DATE ) )
-,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) )
-,m_aDateListBox(this,ModuleRes(LB_DATE_TYPE ) )
-,m_aFL0(this,ModuleRes(FL_SEPARATOR0) )
-,m_aTime(this, ModuleRes(CB_TIME ) )
-,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) )
-,m_aTimeListBox(this,ModuleRes(LB_TIME_TYPE ) )
-,m_aFL1(this, ModuleRes(FL_SEPARATOR1) )
-,m_aPB_OK(this, ModuleRes(PB_OK))
-,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL))
-,m_aPB_Help(this, ModuleRes(PB_HELP))
+: ModalDialog( _pParent, "DateTimeDialog" ,
"modules/dbreport/ui/datetimedialog.ui" )
+
,m_aDateControlling()
,m_aTimeControlling()
,m_pController(_pController)
,m_xHoldAlive(_xHoldAlive)
{
+get(m_pDate,"date");
+get(m_pFTDateFormat,"datelistbox_label");
+get(m_pDateListBox,"datelistbox");
+get(m_pTime,"time");
+get(m_pFTTimeFormat,"timelistbox_label");
+get(m_pTimeListBox,"timelistbox");
+get(m_pPB_OK,"ok");
+
DBG_CTOR( rpt_ODateTimeDialog,NULL);
try
@@ -83,29 +80,28 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
{
}
-m_aDateListBox.SetDropDownLineCount(20);
-m_aDateListBox.SelectEntryPos(0);
+m_pDateListBox->SetDropDownLineCount(20);
+m_pDateListBox->SelectEntryPos(0);
-m_aTimeListBox.SetDropDownLineCount(20);
-m_aTimeListBox.SelectEntryPos(0);
+m_pTimeListBox->SetDropDownLineCount(20);
+m_pTimeListBox->SelectEntryPos(0);
// use nice enhancement, to toggle enable/disable if a checkbox is checked
or not
-m_aDateControlling.enableOnCheckMark( m_aDate, m_aFTDateFormat,
m_aDateListBox);
-m_aTimeControlling.enableOnCheckMark( m_aTime, m_aFTTimeFormat,
m_aTimeListBox);
+m_aDateControlling.enableOnCheckMark( *m_pDate, *m_pFTDateFormat,
*m_pDateListBox);
+m_aTimeControlling.enableOnCheckMark( *m_pTime, *m_pFTTimeFormat,
*m_pTimeListBox);
-CheckBox* pCheckBoxes[] = { &m_aDate,&m_aTime};
+CheckBox* pCheckBoxes[] = { m_pDate,m_pTime};
for ( size_t i = 0 ; i
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/shared/explorer/database/rep_datetime.xhp |4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit e56f7c1e00ee2d6e23c81719319126c84eeb2bb6 Author: Csikós Tamás Date: Wed Jul 31 14:02:11 2013 +0200 update help ids for date time dialog .ui conversion Change-Id: Icbdc3b9cab375db8caf694c65ada055d70f59753 Reviewed-on: https://gerrit.libreoffice.org/5214 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index eca4e7a..38a7d60 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6224,10 +6224,6 @@ framework_MultiLineEdit_DLG_LICENSE_ML_LICENSE,1077938699, framework_PushButton_DLG_LICENSE_PB_ACCEPT,1077940759, framework_PushButton_DLG_LICENSE_PB_DECLINE,1077940758, framework_PushButton_DLG_LICENSE_PB_PAGEDOWN,1077940754, -reportdesign_CheckBox_RID_DATETIME_DLG_CB_DATE,1577878529, -reportdesign_CheckBox_RID_DATETIME_DLG_CB_TIME,1577878533, -reportdesign_ListBox_RID_DATETIME_DLG_LB_DATE_TYPE,1577881091, -reportdesign_ListBox_RID_DATETIME_DLG_LB_TIME_TYPE,1577881095, reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236, reportdesign_ListBox_RID_GROUPS_SORTING_LST_GROUPONLST,2114719238, reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234, diff --git a/source/text/shared/explorer/database/rep_datetime.xhp b/source/text/shared/explorer/database/rep_datetime.xhp index 15e0ed0..bdf4821 100644 --- a/source/text/shared/explorer/database/rep_datetime.xhp +++ b/source/text/shared/explorer/database/rep_datetime.xhp @@ -33,11 +33,11 @@ You can open the Date and Time dialog of the Report Builder by choosing Insert - Date and Time. Press Shift-F1 and point with the mouse at an input box to see a help text for this input box. -Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed. +Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed. Select a format to display the date. -Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed. +Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed. Select a format to display the time. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 502a066c75389285328be3a3c2f8b0a6d2d5aa2c Author: Csikós Tamás Date: Wed Jul 31 14:02:11 2013 +0200 Updated core Project: help e56f7c1e00ee2d6e23c81719319126c84eeb2bb6 update help ids for date time dialog .ui conversion Change-Id: Icbdc3b9cab375db8caf694c65ada055d70f59753 Reviewed-on: https://gerrit.libreoffice.org/5214 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 1d342b5..e56f7c1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1d342b5132ae3c6efbbb8b81df14726c2ef15d59 +Subproject commit e56f7c1e00ee2d6e23c81719319126c84eeb2bb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source
cui/UIConfig_cui.mk|1
cui/source/inc/cuires.hrc |1
cui/source/inc/optdict.hxx | 35 +-
cui/source/options/optdict.cxx | 280 +++
cui/source/options/optdict.hrc | 47 ---
cui/source/options/optdict.src | 128 --
cui/uiconfig/ui/editdictionarydialog.ui| 298 +
extras/source/glade/libreoffice-catalog.xml.in |3
8 files changed, 465 insertions(+), 328 deletions(-)
New commits:
commit 3604f3f005c392006378bb90e4ff42fed73a138b
Author: Csikós Tamás
Date: Thu Aug 1 16:53:28 2013 +0200
modern .ui widgetlayout for editdictionarydialog
widget found at writer/tools/options/writing aid
Conflicts:
cui/UIConfig_cui.mk
Change-Id: I1cd4ff5c85f373ccd8d7b808f6ef869fe4c2d312
Reviewed-on: https://gerrit.libreoffice.org/5228
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 1401bb8..99424f8 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/colorpage \
cui/uiconfig/ui/comment \
cui/uiconfig/ui/cuiimapdlg \
+ cui/uiconfig/ui/editdictionarydialog \
cui/uiconfig/ui/formatnumberdialog \
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index ec0cf14..c4afb90 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -204,6 +204,7 @@
// dialogs
#define RID_SVX_WND_COMMON_LINGU( RID_SVX_START + 0 )
#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB(RID_SVX_START + 337)
+#define STR_MODIFY (RID_SVX_START + 336)//from
optdict.src
#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22)
// hyperlink dialog
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index cd1a0a8..05d91c1 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -82,6 +82,8 @@ class SvxDictEdit : public Edit
public:
SvxDictEdit(Window* pParent, const ResId& rResId) :
Edit(pParent, rResId), bSpaces(sal_False){}
+SvxDictEdit(Window* pParent, WinBits aWB) :
+Edit(pParent, aWB), bSpaces(sal_False){}
voidSetActionHdl( const Link& rLink )
{ aActionLink = rLink;}
@@ -98,22 +100,19 @@ class SvxEditDictionaryDialog : public ModalDialog
{
private:
-FixedText aBookFT;
-ListBox aAllDictsLB;
-FixedText aLangFT;
-SvxLanguageBox aLangLB;
-
-FixedText aWordFT;
-SvxDictEdit aWordED;
-FixedText aReplaceFT;
-SvxDictEdit aReplaceED;
-SvTabListBoxaWordsLB;
-PushButton aNewReplacePB;
-PushButton aDeletePB;
-FixedLineaEditDictsBox;
-
-HelpButton aHelpBtn;
-CancelButtonaCloseBtn;
+ListBox* pAllDictsLB;
+FixedText* pLangFT;
+SvxLanguageBox* pLangLB;
+
+SvxDictEdit* pWordED;
+FixedText* pReplaceFT;
+SvxDictEdit* pReplaceED;
+SvTabListBox*pWordsLB;
+PushButton* pNewReplacePB;
+PushButton* pDeletePB;
+
+HelpButton* pHelpBtn;
+CancelButton*pCloseBtn;
String sModify;
String sNew;
DecorationView aDecoView;
@@ -148,7 +147,7 @@ private:
protected:
-virtual voidPaint( const Rectangle& rRect );
+//virtual voidPaint( const Rectangle& rRect );
public:
SvxEditDictionaryDialog( Window* pParent,
@@ -157,7 +156,7 @@ public:
::com::sun::star::linguistic2::XSpellChecker1> &xSpl );
~SvxEditDictionaryDialog();
-sal_uInt16 GetSelectedDict() {return aAllDictsLB.GetSelectEntryPos();}
+sal_uInt16 GetSelectedDict() {return pAllDictsLB->GetSelectEntryPos();}
};
#endif
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 020cb17..f30a69d 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -32,7 +32,6 @@
#include
#include
-#include "optdict.hrc"
#include "optdict.hxx"
#include
#include
@@ -194,30 +193,21 @@ IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog,
ModifyHdl_Impl)
//
//==
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window
*pParent, VclBuilder::stringmap&)
+{
+WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_BORDER|W
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/source/ui/dbgui/validate.cxx | 34 ++
sc/source/ui/dbgui/validate.src | 53 -
sc/source/ui/inc/validate.hrc |3
sc/source/ui/inc/validate.hxx | 10 -
sc/uiconfig/scalc/ui/validationhelptabpage.ui | 147 ++
6 files changed, 167 insertions(+), 81 deletions(-)
New commits:
commit e8db0fb6f98fe5346a0da613bef99895336bec8a
Author: Csikós Tamás
Date: Fri Aug 2 18:27:04 2013 +0200
modern .ui widgetlayout for validate
widget found at: spreadsheet/data/validate
Change-Id: Ib4eed0e25f851f90e5dad0dee74a0729da10aa5e
Reviewed-on: https://gerrit.libreoffice.org/5254
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 2a168fa..f180a53 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -123,6 +123,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/textimportcsv \
sc/uiconfig/scalc/ui/tpviewpage \
sc/uiconfig/scalc/ui/ungroupdialog \
+ sc/uiconfig/scalc/ui/validationhelptabpage \
sc/uiconfig/scalc/ui/movecopysheet \
))
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 575c238..a9e0415 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -686,17 +686,13 @@ ScTPValidationHelp::ScTPValidationHelp( Window*
pParent,
const SfxItemSet& rArgSet )
: SfxTabPage ( pParent,
- ScResId( TP_VALIDATION_INPUTHELP ),
- rArgSet ),
-aTsbHelp( this, ScResId( TSB_HELP ) ),
-aFlContent ( this, ScResId( FL_CONTENT ) ),
-aFtTitle( this, ScResId( FT_TITLE ) ),
-aEdtTitle ( this, ScResId( EDT_TITLE ) ),
-aFtInputHelp( this, ScResId( FT_INPUTHELP ) ),
-aEdInputHelp( this, ScResId( EDT_INPUTHELP ) )
+ "ValidationHelpTabPage" ,
"modules/scalc/ui/validationhelptabpage.ui" ,
+ rArgSet )
{
+get(pTsbHelp,"tsbhelp");
+get(pEdtTitle,"title");
+get(pEdInputHelp,"inputhelp");
Init();
-FreeResource();
}
// ---
@@ -709,7 +705,7 @@ ScTPValidationHelp::~ScTPValidationHelp()
void ScTPValidationHelp::Init()
{
-aTsbHelp.EnableTriState( false );
+pTsbHelp->EnableTriState( false );
}
//
@@ -734,28 +730,28 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet
)
const SfxPoolItem* pItem;
if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, sal_True, &pItem ) ==
SFX_ITEM_SET )
-aTsbHelp.SetState( ((const SfxBoolItem*)pItem)->GetValue() ?
STATE_CHECK : STATE_NOCHECK );
+pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ?
STATE_CHECK : STATE_NOCHECK );
else
-aTsbHelp.SetState( STATE_NOCHECK );
+pTsbHelp->SetState( STATE_NOCHECK );
if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, sal_True, &pItem ) ==
SFX_ITEM_SET )
-aEdtTitle.SetText( ((const SfxStringItem*)pItem)->GetValue() );
+pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
else
-aEdtTitle.SetText( EMPTY_STRING );
+pEdtTitle->SetText( EMPTY_STRING );
if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, sal_True, &pItem ) ==
SFX_ITEM_SET )
-aEdInputHelp.SetText( ((const SfxStringItem*)pItem)->GetValue() );
+pEdInputHelp->SetText( ((const SfxStringItem*)pItem)->GetValue() );
else
-aEdInputHelp.SetText( EMPTY_STRING );
+pEdInputHelp->SetText( EMPTY_STRING );
}
// ---
sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
{
-rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, aTsbHelp.GetState() ==
STATE_CHECK ) );
-rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aEdtTitle.GetText() ) );
-rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aEdInputHelp.GetText() ) );
+rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() ==
STATE_CHECK ) );
+rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) );
+rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() )
);
return sal_True;
}
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index 57a5b73..7a6b798 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -193,59 +193,6 @@ TabPage TP_VALIDATION_VALUES
};
};
-TabPage TP_VALIDATION_INPUTHELP
-{
-HelpID = "sc:TabPage:TP_VALIDATION_INPUTHELP";
-Hide = TRUE ;
-SVLook = TRUE ;
-Size = MAP_A
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/4802/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/4802/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/4802/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/4755/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/4755/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/4755/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4653/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4653/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/73/4673/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/4866/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/4866/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/4983/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4653/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/4934/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/4934/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/5228/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/5228/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/4934/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/5034/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4653/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/5228/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/4854/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/4854/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/13/5213/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4653/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4653/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/5034/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/4814/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/4934/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/4783/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/5254/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/5254/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/4783/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/4917/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/4707/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/4983/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/5064/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/4783/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/83/4783/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/11/5211/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/4972/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/5221/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/5254/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/5064/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/5110/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/4707/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/5221/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/4814/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/5110/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/11/5211/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/4972/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/11/5211/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/4843/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/4972/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/4771/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/13/5213/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
