You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/04/17 14:34:27 UTC
[openoffice] branch trunk updated: Reduce handle sets by removing simple handles. Removing handles options form Writer and Calc. Removing help texts accordingly.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 496a34a72c Reduce handle sets by removing simple handles. Removing handles options form Writer and Calc. Removing help texts accordingly.
496a34a72c is described below
commit 496a34a72c361332bbb3d8f2fe731ee518099072
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Apr 17 16:31:15 2023 +0200
Reduce handle sets by removing simple handles.
Removing handles options form Writer and Calc.
Removing help texts accordingly.
---
main/default_images/svx/res/cropmarkers.png | Bin 645 -> 612 bytes
main/default_images/svx/res/cropmarkers2.png | Bin 612 -> 0 bytes
main/default_images/svx/res/markers.png | Bin 3179 -> 8549 bytes
main/default_images/svx/res/markers2.png | Bin 8549 -> 0 bytes
main/helpcontent2/helpers/help_hid.lst | 1 -
.../source/text/shared/optionen/01040200.xhp | 17 +-
.../source/text/shared/optionen/01060100.xhp | 20 +-
.../classic/classic_images.tar.gz | Bin 1879668 -> 1876054 bytes
.../svx/res/{cropmarkers2.png => cropmarkers.png} | Bin
.../svx/res/{markers2.png => markers.png} | Bin
main/sc/source/ui/inc/optdlg.hrc | 129 ++++----
main/sc/source/ui/inc/tpview.hxx | 10 +-
main/sc/source/ui/optdlg/tpview.cxx | 17 -
main/sc/source/ui/src/optdlg.src | 17 +-
main/svx/source/svdraw/svdstr.src | 4 +-
main/sw/source/ui/config/optdlg.hrc | 350 ++++++++++-----------
main/sw/source/ui/config/optdlg.src | 17 +-
main/sw/source/ui/config/optpage.cxx | 22 +-
main/sw/source/ui/config/viewopt.cxx | 29 +-
main/sw/source/ui/inc/optpage.hxx | 10 +-
20 files changed, 303 insertions(+), 340 deletions(-)
diff --git a/main/default_images/svx/res/cropmarkers.png b/main/default_images/svx/res/cropmarkers.png
index c59af51a2e..13175d6bc5 100644
Binary files a/main/default_images/svx/res/cropmarkers.png and b/main/default_images/svx/res/cropmarkers.png differ
diff --git a/main/default_images/svx/res/cropmarkers2.png b/main/default_images/svx/res/cropmarkers2.png
deleted file mode 100644
index 13175d6bc5..0000000000
Binary files a/main/default_images/svx/res/cropmarkers2.png and /dev/null differ
diff --git a/main/default_images/svx/res/markers.png b/main/default_images/svx/res/markers.png
index 5124b392f4..10294bb941 100644
Binary files a/main/default_images/svx/res/markers.png and b/main/default_images/svx/res/markers.png differ
diff --git a/main/default_images/svx/res/markers2.png b/main/default_images/svx/res/markers2.png
deleted file mode 100644
index 10294bb941..0000000000
Binary files a/main/default_images/svx/res/markers2.png and /dev/null differ
diff --git a/main/helpcontent2/helpers/help_hid.lst b/main/helpcontent2/helpers/help_hid.lst
index fd572fb4cf..b18ebb8c90 100644
--- a/main/helpcontent2/helpers/help_hid.lst
+++ b/main/helpcontent2/helpers/help_hid.lst
@@ -7084,7 +7084,6 @@ sc_CheckBox_RID_SCPAGE_CONTENT_CB_CLIP,958186529,
sc_CheckBox_RID_SCPAGE_CONTENT_CB_FORMULA,958186517,
sc_CheckBox_RID_SCPAGE_CONTENT_CB_GRID,958186553,
sc_CheckBox_RID_SCPAGE_CONTENT_CB_GUIDELINE,958186556,
-sc_CheckBox_RID_SCPAGE_CONTENT_CB_HANDLES,958186563,
sc_CheckBox_RID_SCPAGE_CONTENT_CB_HSCROLL,958186548,
sc_CheckBox_RID_SCPAGE_CONTENT_CB_NIL,958186518,
sc_CheckBox_RID_SCPAGE_CONTENT_CB_OUTLINE,958186551,
diff --git a/main/helpcontent2/source/text/shared/optionen/01040200.xhp b/main/helpcontent2/source/text/shared/optionen/01040200.xhp
index d001986a29..c04c2af140 100644
--- a/main/helpcontent2/source/text/shared/optionen/01040200.xhp
+++ b/main/helpcontent2/source/text/shared/optionen/01040200.xhp
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--***********************************************************
- *
+ *
* 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
@@ -11,22 +9,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedoptionen01040200xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">View</title>
@@ -36,7 +32,6 @@
<body>
<section id="layout">
<bookmark xml-lang="en-US" branch="index" id="bm_id3156346"><bookmark_value>guides; showing when moving frames (Writer)</bookmark_value>
-<bookmark_value>simple handles (Writer)</bookmark_value>
<bookmark_value>handles; displaying (Writer)</bookmark_value>
<bookmark_value>large handles (Writer)</bookmark_value>
<bookmark_value>scrollbars; horizontal and vertical (Writer)</bookmark_value>
@@ -66,8 +61,6 @@
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="4">Specifies settings that refer to the representation of boundaries.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" oldref="9">Guides while moving</paragraph>
<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS">Displays guides around the frames when frames are moved. You can select the<emph> Guides while moving </emph>option to show the exact position of the object using lineal values.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="23">Simple handles</paragraph>
-<paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_HANDLE">Displays the handles (the eight points on a delimiting rectangle) as simple squares without 3D effect.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE" id="bm_id3149234" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="32">Large handles</paragraph>
<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_BIGHANDLE">Displays larger sized handles (the eight points on a delimiting rectangle).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149416" xml-lang="en-US" level="2" l10n="U" oldref="11">View</paragraph>
diff --git a/main/helpcontent2/source/text/shared/optionen/01060100.xhp b/main/helpcontent2/source/text/shared/optionen/01060100.xhp
index 20bd7da0dc..9d91ed0877 100644
--- a/main/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/main/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -2,7 +2,7 @@
<helpdocument version="1.0">
<!--***********************************************************
- *
+ *
* 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
@@ -10,21 +10,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
<meta>
<topic id="textsharedoptionen01060100xml" indexer="include">
<title xml-lang="en-US" id="tit">View</title>
@@ -39,7 +37,7 @@
<bookmark_value>colors; grid lines and cells (Calc)</bookmark_value>
<bookmark_value>page breaks; displaying (Calc)</bookmark_value>
<bookmark_value>guides; showing (Calc)</bookmark_value>
- <bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
+ <bookmark_value>handles; showing large handles (Calc)</bookmark_value>
<bookmark_value>displaying; zero values (Calc)</bookmark_value>
<bookmark_value>zero values; displaying (Calc)</bookmark_value>
<bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
@@ -59,7 +57,7 @@
<bookmark_value>sheet tabs; displaying</bookmark_value>
<bookmark_value>tabs; displaying sheet tabs</bookmark_value>
<bookmark_value>outlines;outline symbols</bookmark_value>
-</bookmark><comment>MW copied "displaying;comments" over to Calc guide note_insert.xhp and deleted "comments;displaying"</comment>
+</bookmark><comment>MW copied "displaying;comments" over to Calc guide note_insert.xhp and deleted "comments;displaying"</comment>
<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150445" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3153988" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
@@ -86,10 +84,6 @@
<paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="3" l10n="U"
oldref="36">Guides while moving</paragraph>
<paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES" id="bm_id3153380" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="3" l10n="U"
- oldref="38">Simple handles</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154140" role="paragraph" l10n="U" oldref="39"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES">Specifies whether to display the handles (the eight points on a selection box) as simple squares without 3D effect.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES" id="bm_id3151176" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="3" l10n="U"
oldref="40">Large handles</paragraph>
@@ -170,4 +164,4 @@
<paragraph xml-lang="en-US" id="par_id3145135" role="paragraph" l10n="U" oldref="53"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE">If you have defined an <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/12080000.xhp" name="outline">outline</link>
</caseinline><defaultinline>outline</defaultinline></switchinline>, the <emph>Outline symbols</emph> option specifies whether to view the outline symbols at the border of the sheet.</ahelp></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz
index 128a4f0e1a..b33deaf25a 100644
Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/main/ooo_custom_images/industrial/svx/res/cropmarkers2.png b/main/ooo_custom_images/industrial/svx/res/cropmarkers.png
similarity index 100%
rename from main/ooo_custom_images/industrial/svx/res/cropmarkers2.png
rename to main/ooo_custom_images/industrial/svx/res/cropmarkers.png
diff --git a/main/ooo_custom_images/industrial/svx/res/markers2.png b/main/ooo_custom_images/industrial/svx/res/markers.png
similarity index 100%
rename from main/ooo_custom_images/industrial/svx/res/markers2.png
rename to main/ooo_custom_images/industrial/svx/res/markers.png
diff --git a/main/sc/source/ui/inc/optdlg.hrc b/main/sc/source/ui/inc/optdlg.hrc
index a87cfde38c..3b33b3b72d 100644
--- a/main/sc/source/ui/inc/optdlg.hrc
+++ b/main/sc/source/ui/inc/optdlg.hrc
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -24,26 +24,26 @@
#include "sc.hrc"
/*
-#define RID_SCDLG_OPTIONS 256
+#define RID_SCDLG_OPTIONS 256
#define RID_SCPAGE_VIEW 256
-#define RID_SCPAGE_USERLISTS 257
-#define RID_SCPAGE_CALC 258
-#define RID_SCPAGE_PRINT 259
+#define RID_SCPAGE_USERLISTS 257
+#define RID_SCPAGE_CALC 258
+#define RID_SCPAGE_PRINT 259
*/
#define TP_GENERAL 1
-#define TP_SAVE 2
-#define TP_PATH 3
-#define TP_SPELL 4
-#define TP_VIEW 5
-#define TP_CALC 6
-#define TP_USERLISTS 7
-#define TP_PRINT 8
-#define TP_COLORS 9
-#define TP_GRID 10
-#define TP_CONTENT 11
-#define TP_LAYOUT 12
-#define TP_INPUT 13
+#define TP_SAVE 2
+#define TP_PATH 3
+#define TP_SPELL 4
+#define TP_VIEW 5
+#define TP_CALC 6
+#define TP_USERLISTS 7
+#define TP_PRINT 8
+#define TP_COLORS 9
+#define TP_GRID 10
+#define TP_CONTENT 11
+#define TP_LAYOUT 12
+#define TP_INPUT 13
#define TP_CHANGES 14
// TP_CALC:
@@ -60,13 +60,13 @@
#define BTN_DATE1904 11
#define FT_VALUE 13
#define GB_DATE 14
-#define BTN_CASE 15
-#define FT_CASE 16
+#define BTN_CASE 15
+#define FT_CASE 16
#define BTN_CALC 17
#define BTN_MATCH 18
#define BTN_LOOKUP 19
-#define BTN_REGEX 20
-#define BTN_GENERAL_PREC 21
+#define BTN_REGEX 20
+#define BTN_GENERAL_PREC 21
// TP_VIEW:
#define BTN_VSCROLL 1
@@ -75,14 +75,14 @@
#define BTN_OUTLINER 4
#define BTN_HEADERFOOTER 5
#define BTN_GRID 6
-#define BTN_SYNTAX 7
+#define BTN_SYNTAX 7
#define LB_GRIDCOLOR 9
#define GB_ELEMENTS 10
-#define BTN_HELPLINES 11
+#define BTN_HELPLINES 11
-#define BTN_FORMULAS 20
-#define BTN_NULLVALS 21
-#define BTN_NOTES 22
+#define BTN_FORMULAS 20
+#define BTN_NULLVALS 21
+#define BTN_NOTES 22
#define GB_CONTENTS 23
//#define FT_OLE 31
@@ -105,11 +105,11 @@
#define BTN_ADD 2
#define BTN_REMOVE 3
#define BTN_COPY 4
-#define STR_QUERYREMOVE 5
-#define STR_DISMISS 6
-#define STR_COPYLIST 7
-#define STR_COPYFROM 8
-#define STR_COPYERR 9
+#define STR_QUERYREMOVE 5
+#define STR_DISMISS 6
+#define STR_COPYLIST 7
+#define STR_COPYFROM 8
+#define STR_COPYERR 9
// TP_PRINT:
#define FL_PAGES 1
@@ -119,36 +119,36 @@
// TP_LCONTENT
-#define GB_DISPLAY 20
-#define CB_FORMULA 21
-#define CB_NIL 22
-#define CB_ANNOT 23
-#define CB_VALUE 24
-#define CB_ANCHOR 25
-#define GB_OBJECT 26
-#define FT_OBJGRF 27
-#define LB_OBJGRF 28
-#define FT_DIAGRAM 29
-#define LB_DIAGRAM 30
-#define FT_DRAW 31
-#define LB_DRAW 32
-#define CB_CLIP 33
-#define GB_ZOOM 34
-#define CB_SYNCZOOM 35
+#define GB_DISPLAY 20
+#define CB_FORMULA 21
+#define CB_NIL 22
+#define CB_ANNOT 23
+#define CB_VALUE 24
+#define CB_ANCHOR 25
+#define GB_OBJECT 26
+#define FT_OBJGRF 27
+#define LB_OBJGRF 28
+#define FT_DIAGRAM 29
+#define LB_DIAGRAM 30
+#define FT_DRAW 31
+#define LB_DRAW 32
+#define CB_CLIP 33
+#define GB_ZOOM 34
+#define CB_SYNCZOOM 35
// TP_LAYOUT
-#define GB_LINK 1
+#define GB_LINK 1
#define RB_ALWAYS 2
-#define RB_REQUEST 3
-#define RB_NEVER 4
+#define RB_REQUEST 3
+#define RB_NEVER 4
#define CB_DOCONLY 5
#define CB_MERGE_PARA_DIST 6
-#define GB_COMPAT 7
-#define CB_AUTO_UPDATE_FIELDS 8
-#define CB_AUTO_UPDATE_CHARTS 9
+#define GB_COMPAT 7
+#define CB_AUTO_UPDATE_FIELDS 8
+#define CB_AUTO_UPDATE_CHARTS 9
#define FT_UPDATE_LINKS 10
-#define GB_WINDOW 50
+#define GB_WINDOW 50
#define CB_ROWCOLHEADER 51
#define CB_HSCROLL 52
#define CB_VSCROLL 53
@@ -165,14 +165,13 @@
#define GB_TAB 64
#define MF_TAB 65
#define CB_PAGEBREAKS 66
-#define CB_HANDLES 67
#define CB_BIGHANDLES 68
-#define FT_TAB 69
-#define FT_UNIT 70
-#define FL_SEPARATOR1 71
-#define FL_SEPARATOR2 72
-#define FL_SEPARATOR 73
-#define FL_H_SEPARATOR 74
+#define FT_TAB 69
+#define FT_UNIT 70
+#define FL_SEPARATOR1 71
+#define FL_SEPARATOR2 72
+#define FL_SEPARATOR 73
+#define FL_H_SEPARATOR 74
// TP_INPUT
#define GB_OPTIONS 70
@@ -184,5 +183,5 @@
#define CB_EXPREF 76
#define CB_MARKHDR 77
#define CB_TEXTFMT 78
-#define CB_REPLWARN 79
+#define CB_REPLWARN 79
diff --git a/main/sc/source/ui/inc/tpview.hxx b/main/sc/source/ui/inc/tpview.hxx
index 0dd2593b19..e72c02f102 100644
--- a/main/sc/source/ui/inc/tpview.hxx
+++ b/main/sc/source/ui/inc/tpview.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -47,7 +47,6 @@ class ScTpContentOptions : public SfxTabPage
ColorListBox aColorLB;
CheckBox aBreakCB;
CheckBox aGuideLineCB;
- CheckBox aHandleCB;
CheckBox aBigHandleCB;
FixedLine aSeparator1FL;
@@ -164,4 +163,3 @@ public:
//========================================================================
#endif // SC_TPUSRLST_HXX
-
diff --git a/main/sc/source/ui/optdlg/tpview.cxx b/main/sc/source/ui/optdlg/tpview.cxx
index 8176738d6f..e4c2481915 100644
--- a/main/sc/source/ui/optdlg/tpview.cxx
+++ b/main/sc/source/ui/optdlg/tpview.cxx
@@ -25,8 +25,6 @@
#include "precompiled_scui.hxx"
-
-
//------------------------------------------------------------------
#include "scitems.hxx"
@@ -65,7 +63,6 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aColorLB( this, ScResId(LB_COLOR )),
aBreakCB( this, ScResId(CB_PAGEBREAKS )),
aGuideLineCB( this, ScResId(CB_GUIDELINE )),
- aHandleCB( this, ScResId(CB_HANDLES )),
aBigHandleCB( this, ScResId(CB_BIGHANDLES )),
aSeparator1FL (this, ScResId(FL_SEPARATOR1 )),
@@ -121,7 +118,6 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aOutlineCB .SetClickHdl(aCBHdl);
aBreakCB .SetClickHdl(aCBHdl);
aGuideLineCB.SetClickHdl(aCBHdl);
- aHandleCB .SetClickHdl(aCBHdl);
aBigHandleCB.SetClickHdl(aCBHdl);
aRowColHeaderCB.SetClickHdl(aCBHdl);
@@ -168,7 +164,6 @@ sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
aColorLB .GetSavedValue() != aColorLB .GetSelectEntryPos() ||
aBreakCB .GetSavedValue() != aBreakCB .IsChecked() ||
aGuideLineCB .GetSavedValue() != aGuideLineCB .IsChecked() ||
- aHandleCB .GetSavedValue() != aHandleCB .IsChecked() ||
aBigHandleCB .GetSavedValue() != aBigHandleCB .IsChecked())
{
pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
@@ -223,7 +218,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
- aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) ); // inverted
aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, sal_False, &pItem))
@@ -252,7 +246,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aColorLB .SaveValue();
aBreakCB .SaveValue();
aGuideLineCB .SaveValue();
- aHandleCB .SaveValue();
aBigHandleCB .SaveValue();
}
/*-----------------11.01.97 12.45-------------------
@@ -316,17 +309,9 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
else if ( &aOutlineCB == pBtn ) eOption = VOPT_OUTLINER;
else if ( &aBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS;
else if ( &aGuideLineCB == pBtn ) eOption = VOPT_HELPLINES;
- else if ( &aHandleCB == pBtn ) eOption = VOPT_SOLIDHANDLES;
else if ( &aBigHandleCB == pBtn ) eOption = VOPT_BIGHANDLES;
else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER;
- // VOPT_SOLIDHANDLES is inverted (CheckBox is "simple handles")
- if ( eOption == VOPT_SOLIDHANDLES )
- pLocalOptions->SetOption( eOption, !bChecked );
- else
- pLocalOptions->SetOption( eOption, bChecked );
-
-
return 0;
}
/*-----------------11.01.97 13.13-------------------
@@ -736,5 +721,3 @@ IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox )
aAlignLB.Enable(pBox->IsChecked());
return 0;
}
-
-
diff --git a/main/sc/source/ui/src/optdlg.src b/main/sc/source/ui/src/optdlg.src
index 5c1e36847f..871e99d9a1 100644
--- a/main/sc/source/ui/src/optdlg.src
+++ b/main/sc/source/ui/src/optdlg.src
@@ -336,17 +336,18 @@ TabPage RID_SCPAGE_CONTENT
Size = MAP_APPFONT ( 112, 10 ) ;
Text [ en-US ] = "Guides ~while moving" ;
};
- CheckBox CB_HANDLES
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES" ;
- Pos = MAP_APPFONT ( 12, 70 ) ;
- Size = MAP_APPFONT ( 112, 10 ) ;
- Text [ en-US ] = "~Simple handles" ;
- };
+// TODO: Remove code for unused handles
+// CheckBox CB_HANDLES
+// {
+// HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES" ;
+// Pos = MAP_APPFONT ( 12, 70 ) ;
+// Size = MAP_APPFONT ( 112, 10 ) ;
+// Text [ en-US ] = "~Simple handles" ;
+// };
CheckBox CB_BIGHANDLES
{
HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES" ;
- Pos = MAP_APPFONT ( 12, 84 ) ;
+ Pos = MAP_APPFONT ( 12, 70 ) ;
Size = MAP_APPFONT ( 112, 10 ) ;
Text [ en-US ] = "~Large handles" ;
};
diff --git a/main/svx/source/svdraw/svdstr.src b/main/svx/source/svdraw/svdstr.src
index 6991eb2920..59114de597 100644
--- a/main/svx/source/svdraw/svdstr.src
+++ b/main/svx/source/svdraw/svdstr.src
@@ -2755,7 +2755,7 @@ Bitmap SIP_SA_MARKERS
Bitmap SIP_SA_FINE_MARKERS
{
- File = "markers2.png" ;
+ File = "markers.png" ;
};
// #100499#
@@ -2854,7 +2854,7 @@ Bitmap SIP_SA_CROP_MARKERS
Bitmap SIP_SA_CROP_FINE_MARKERS
{
- File = "cropmarkers2.png" ;
+ File = "cropmarkers.png" ;
};
Bitmap SIP_SA_ACCESSIBILITY_CROP_MARKERS
diff --git a/main/sw/source/ui/config/optdlg.hrc b/main/sw/source/ui/config/optdlg.hrc
index 4e2a4e807e..e91f06d5fb 100644
--- a/main/sw/source/ui/config/optdlg.hrc
+++ b/main/sw/source/ui/config/optdlg.hrc
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,198 +7,196 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-/* TabPage Ansicht*/
-#define FL_DISP 1
-#define FL_NOPRINT 2
-#define FL_WINDOW 3
-
-#define CB_GRF 1
-#define CB_TBL 2
-#define CB_DRWFAST 3
-#define CB_FIELD 4
-#define CB_PARA 5
-#define CB_TAB 6
-#define CB_SPACE 7
-#define CB_HSPACE 8
-#define CB_SHYPH 9
-#define CB_FLD_HIDDEN 10
-#define CB_BREAK 11
-#define CB_ANY_RULER 12
-#define CB_CROSS 14
-#define CB_HSCROLL 15
-#define CB_VSCROLL 16
-#define CB_HRULER 17
-#define CB_VRULER 18
-#define FL_LINE 22
-#define CB_POSTIT 23
-#define CB_VRULER_RIGHT 24
-#define CB_BIGHANDLE 25
-
-#define FL_SETTINGS 26
-#define LB_METRIC 27
-#define FT_METRIC 28
-
-//test tab page
-#define CB_TEST1 25
-#define CB_TEST2 26
-#define CB_TEST3 27
-#define CB_TEST4 28
-#define CB_TEST5 29
-#define CB_TEST6 30
-#define CB_TEST7 31
-#define CB_TEST8 32
-#define CB_TEST9 33
-#define CB_TEST10 34
-#define FL_TEST 35
-
-#define CB_FLD_HIDDEN_PARA 36 //Mittendrin, damit die HelpIds zum FPII kompatibel bleiben
+// TabPage view
+#define FL_DISP 1
+#define FL_NOPRINT 2
+#define FL_WINDOW 3
+
+#define CB_GRF 1
+#define CB_TBL 2
+#define CB_DRWFAST 3
+#define CB_FIELD 4
+#define CB_PARA 5
+#define CB_TAB 6
+#define CB_SPACE 7
+#define CB_HSPACE 8
+#define CB_SHYPH 9
+#define CB_FLD_HIDDEN 10
+#define CB_BREAK 11
+#define CB_ANY_RULER 12
+#define CB_CROSS 14
+#define CB_HSCROLL 15
+#define CB_VSCROLL 16
+#define CB_HRULER 17
+#define CB_VRULER 18
+#define FL_LINE 22
+#define CB_POSTIT 23
+#define CB_VRULER_RIGHT 24
+#define CB_BIGHANDLE 25
+
+#define FL_SETTINGS 26
+#define LB_METRIC 27
+#define FT_METRIC 28
+
+// test tab page
+#define CB_TEST1 25
+#define CB_TEST2 26
+#define CB_TEST3 27
+#define CB_TEST4 28
+#define CB_TEST5 29
+#define CB_TEST6 30
+#define CB_TEST7 31
+#define CB_TEST8 32
+#define CB_TEST9 33
+#define CB_TEST10 34
+#define FL_TEST 35
+
+#define CB_FLD_HIDDEN_PARA 36 // Mittendrin, damit die HelpIds zum FPII kompatibel bleiben
#define CB_SMOOTH_SCROLL 37
-#define BT_OK 38
-#define BT_CANCEL 39
-#define BT_MORE 40
-#define BT_GRID 41
-#define MF_HFRAME 42
-#define MF_VFRAME 43
+#define BT_OK 38
+#define BT_CANCEL 39
+#define BT_MORE 40
+#define BT_GRID 41
+#define MF_HFRAME 42
+#define MF_VFRAME 43
#define CB_INDEX 44
-#define LB_COLOR 50
-#define WIN_COLOR 52
-#define ED_COLORNAME 53
-#define BT_EDIT 55
-#define BT_NEW 56
-#define BT_DELETE 57
-#define BT_DEFAULT 58
-#define CB_HANDLE 59
+#define LB_COLOR 50
+#define WIN_COLOR 52
+#define ED_COLORNAME 53
+#define BT_EDIT 55
+#define BT_NEW 56
+#define BT_DELETE 57
+#define BT_DEFAULT 58
#define CB_SECT_BOUNDS 60
-#define CB_CHAR_HIDDEN 61
+#define CB_CHAR_HIDDEN 61
// Print-Extra-Page
-#define CB_PGRF 61
-//#define CB_PTAB 62 merged with CB_PGRF in printerpullpages
-//#define CB_PDRAW 63 removed in printerpullpages
-#define CB_LEFTP 64
-#define CB_RIGHTP 65
-//#define CB_REVERSE 66 removed in printerpullpages
-#define CB_PROSPECT 67
-//#define CB_SINGLEJOBS 68 removed in printerpullpages
-#define CB_CTRLFLD 69
-#define CB_PAPERFROMSETUP 70
-#define FL_1 71
-#define FL_2 72
-#define FL_3 73
-#define FL_4 74
-#define FT_FAX 76
-#define CB_BACKGROUND 79
-
-#define RB_NO 80
-#define RB_ONLY 81
-#define RB_END 82
-#define RB_PAGEEND 83
-#define ST_NONE 84
-#define LB_FAX 86
-#define CB_BLACK_FONT 87
-#define LB_HMETRIC 88
-#define LB_VMETRIC 89
-#define FL_SEP_PRT_LEFT 90
-#define FL_SEP_PRT_RIGHT 91
-#define CB_PRINTEMPTYPAGES 92
-#define CB_HIDDEN_TEXT 93
-#define CB_TEXT_PLACEHOLDER 94
-
-
-// Tabpage Grundschriften
+#define CB_PGRF 61
+//#define CB_PTAB 62 merged with CB_PGRF in printerpullpages
+//#define CB_PDRAW 63 removed in printerpullpages
+#define CB_LEFTP 64
+#define CB_RIGHTP 65
+//#define CB_REVERSE 66 removed in printerpullpages
+#define CB_PROSPECT 67
+//#define CB_SINGLEJOBS 68 removed in printerpullpages
+#define CB_CTRLFLD 69
+#define CB_PAPERFROMSETUP 70
+#define FL_1 71
+#define FL_2 72
+#define FL_3 73
+#define FL_4 74
+#define FT_FAX 76
+#define CB_BACKGROUND 79
+
+#define RB_NO 80
+#define RB_ONLY 81
+#define RB_END 82
+#define RB_PAGEEND 83
+#define ST_NONE 84
+#define LB_FAX 86
+#define CB_BLACK_FONT 87
+#define LB_HMETRIC 88
+#define LB_VMETRIC 89
+#define FL_SEP_PRT_LEFT 90
+#define FL_SEP_PRT_RIGHT 91
+#define CB_PRINTEMPTYPAGES 92
+#define CB_HIDDEN_TEXT 93
+#define CB_TEXT_PLACEHOLDER 94
+
+
+// Tabpage basic fonts
#define FT_STANDARD 90
-#define LB_STANDARD 91
-#define FT_TITLE 92
-#define LB_TITLE 93
-#define FT_LIST 94
-#define LB_LIST 95
-#define FT_LABEL 96
-#define LB_LABEL 97
-#define FT_IDX 98
-#define LB_IDX 99
-#define FL_STDCHR 100
-#define PB_STANDARD 101
-#define CB_DOCONLY 102
-#define ST_SCRIPT_WESTERN 103
-#define ST_SCRIPT_ASIAN 104
-#define ST_SCRIPT_CTL 105
-#define FT_TYPE 106
-#define FT_SIZE 107
-#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
-
-//Tabpage Tabelle
-#define CB_HEADER 101
-#define CB_REPEAT_HEADER 102
-#define CB_DONT_SPLIT 103
-#define CB_BORDER 104
-#define CB_NUMFORMATTING 105
-#define CB_NUMALIGNMENT 106
-#define FL_TABLE 107
-#define FL_TABLE_INSERT 108
-#define CB_NUMFMT_FORMATTING 109
-#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_ROWINSERT 116
-#define MF_ROWINSERT 117
-#define FT_COLINSERT 118
-#define MF_COLINSERT 119
-#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 FL_COLOR 130
-#define FT_SGML 131
-#define LB_SGML 132
-#define FT_COMMENT 133
-#define LB_COMMENT 134
-#define FT_KEYWD 135
-#define LB_KEYWD 136
-#define FT_UNKNOWN 137
-#define LB_UNKNOWN 138
-#define FL_TABLE_SEPARATOR 139
-#define CB_PROSPECT_RTL 140
-
-#define FL_SHDWCRSFLAG 1
-#define CB_SHDWCRSONOFF 2
-#define FL_SHDWCRSMODE 3
-#define FT_SHDWCRSFILLMODE 4
-#define RB_SHDWCRSFILLMARGIN 5
-#define RB_SHDWCRSFILLINDENT 6
-#define RB_SHDWCRSFILLTAB 7
-#define RB_SHDWCRSFILLSPACE 8
-#define CB_ALLOW_IN_PROT 12
-#define FL_CRSR_OPT 13
-#define FL_SEPARATOR_SHDW 14
-#define FL_LAYOUT_OPTIONS 15
-#define CB_MATH_BASELINE_ALIGNMENT 16
-
+#define LB_STANDARD 91
+#define FT_TITLE 92
+#define LB_TITLE 93
+#define FT_LIST 94
+#define LB_LIST 95
+#define FT_LABEL 96
+#define LB_LABEL 97
+#define FT_IDX 98
+#define LB_IDX 99
+#define FL_STDCHR 100
+#define PB_STANDARD 101
+#define CB_DOCONLY 102
+#define ST_SCRIPT_WESTERN 103
+#define ST_SCRIPT_ASIAN 104
+#define ST_SCRIPT_CTL 105
+#define FT_TYPE 106
+#define FT_SIZE 107
+#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
+
+// Tabpage table
+#define CB_HEADER 101
+#define CB_REPEAT_HEADER 102
+#define CB_DONT_SPLIT 103
+#define CB_BORDER 104
+#define CB_NUMFORMATTING 105
+#define CB_NUMALIGNMENT 106
+#define FL_TABLE 107
+#define FL_TABLE_INSERT 108
+#define CB_NUMFMT_FORMATTING 109
+#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_ROWINSERT 116
+#define MF_ROWINSERT 117
+#define FT_COLINSERT 118
+#define MF_COLINSERT 119
+#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 FL_COLOR 130
+#define FT_SGML 131
+#define LB_SGML 132
+#define FT_COMMENT 133
+#define LB_COMMENT 134
+#define FT_KEYWD 135
+#define LB_KEYWD 136
+#define FT_UNKNOWN 137
+#define LB_UNKNOWN 138
+#define FL_TABLE_SEPARATOR 139
+#define CB_PROSPECT_RTL 140
+
+#define FL_SHDWCRSFLAG 1
+#define CB_SHDWCRSONOFF 2
+#define FL_SHDWCRSMODE 3
+#define FT_SHDWCRSFILLMODE 4
+#define RB_SHDWCRSFILLMARGIN 5
+#define RB_SHDWCRSFILLINDENT 6
+#define RB_SHDWCRSFILLTAB 7
+#define RB_SHDWCRSFILLSPACE 8
+#define CB_ALLOW_IN_PROT 12
+#define FL_CRSR_OPT 13
+#define FL_SEPARATOR_SHDW 14
+#define FL_LAYOUT_OPTIONS 15
+#define CB_MATH_BASELINE_ALIGNMENT 16
diff --git a/main/sw/source/ui/config/optdlg.src b/main/sw/source/ui/config/optdlg.src
index 9f35ea0bff..8503ed5a3e 100644
--- a/main/sw/source/ui/config/optdlg.src
+++ b/main/sw/source/ui/config/optdlg.src
@@ -55,17 +55,18 @@ TabPage TP_CONTENT_OPT
Size = MAP_APPFONT ( 118, 10 ) ;
Text [ en-US ] = "Guides ~while moving" ;
};
- CheckBox CB_HANDLE
- {
- HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE" ;
- Pos = MAP_APPFONT ( 12, 27 ) ;
- Size = MAP_APPFONT ( 118, 10 ) ;
- Text [ en-US ] = "Sim~ple handles" ;
- };
+// TODO: Remove code for unused handles
+// CheckBox CB_HANDLE
+// {
+// HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE" ;
+// Pos = MAP_APPFONT ( 12, 27 ) ;
+// Size = MAP_APPFONT ( 118, 10 ) ;
+// Text [ en-US ] = "Sim~ple handles" ;
+// };
CheckBox CB_BIGHANDLE
{
HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE" ;
- Pos = MAP_APPFONT ( 12, 40 ) ;
+ Pos = MAP_APPFONT ( 12, 27 ) ;
Size = MAP_APPFONT ( 118, 10 ) ;
Text [ en-US ] = "Large handles" ;
};
diff --git a/main/sw/source/ui/config/optpage.cxx b/main/sw/source/ui/config/optpage.cxx
index 9daaec5202..0655302be0 100644
--- a/main/sw/source/ui/config/optpage.cxx
+++ b/main/sw/source/ui/config/optpage.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -96,7 +96,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
SfxTabPage( pParent, SW_RES( TP_CONTENT_OPT ), rCoreSet ),
aLineFL ( this, SW_RES( FL_LINE ) ),
aCrossCB ( this, SW_RES( CB_CROSS ) ),
- aSolidHandleCB( this, SW_RES( CB_HANDLE ) ),
+// aSolidHandleCB( this, SW_RES( CB_HANDLE ) ),
aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ),
aWindowFL ( this, SW_RES( FL_WINDOW ) ),
@@ -221,7 +221,6 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet)
aFldNameCB .Check (pElemAttr->bFieldName );
aPostItCB .Check (pElemAttr->bNotes );
aCrossCB .Check( pElemAttr->bCrosshair );
- aSolidHandleCB.Check( !pElemAttr->bHandles );
aBigHandleCB.Check(pElemAttr->bBigHandles );
aHScrollBox.Check( pElemAttr->bHorzScrollbar );
aVScrollBox.Check( pElemAttr->bVertScrollbar );
@@ -255,7 +254,6 @@ sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
aElem.bFieldName = aFldNameCB .IsChecked();
aElem.bNotes = aPostItCB .IsChecked();
aElem.bCrosshair = aCrossCB .IsChecked();
- aElem.bHandles = !aSolidHandleCB.IsChecked();
aElem.bBigHandles = aBigHandleCB.IsChecked();
aElem.bHorzScrollbar = aHScrollBox.IsChecked();
aElem.bVertScrollbar = aVScrollBox.IsChecked();
@@ -399,7 +397,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
// aPrintHiddenTextCB.SetPosPixel(aBlackFontCB.GetPosPixel());
// aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel());
// aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel());
-
+
// hide aPrintEmptyPagesCB and move everything below up accordingly
long nDeltaY = aPaperFromSetupCB.GetPosPixel().getY() - aPrintEmptyPagesCB.GetPosPixel().getY();
aPrintEmptyPagesCB.Hide();
@@ -930,7 +928,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
FontInfo aInf( pPrt->GetDevFont( i ) );
aFontNames.insert( aInf.GetName() );
}
-
+
// insert to listboxes
for( std::set< String >::const_iterator it = aFontNames.begin();
it != aFontNames.end(); ++it )
@@ -1960,7 +1958,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
aChangedLB.RemoveEntry(5);
aDeletedLB.RemoveEntry(4);
aDeletedLB.RemoveEntry(3);
-
+
Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
aInsertLB.SetSelectHdl( aLk );
aDeletedLB.SetSelectHdl( aLk );
@@ -2210,14 +2208,14 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& )
aInsertLB.SelectEntryPos(0);
aDeletedLB.SelectEntryPos(0);
aChangedLB.SelectEntryPos(0);
-
+
lcl_FillRedlineAttrListBox(aInsertLB, rInsertAttr, aInsertAttrMap,
sizeof(aInsertAttrMap) / sizeof(sal_uInt16));
lcl_FillRedlineAttrListBox(aDeletedLB, rDeletedAttr, aDeletedAttrMap,
sizeof(aDeletedAttrMap) / sizeof(sal_uInt16));
lcl_FillRedlineAttrListBox(aChangedLB, rChangedAttr, aChangedAttrMap,
sizeof(aChangedAttrMap) / sizeof(sal_uInt16));
-
+
sal_uInt16 nPos = 0;
switch (pOpt->GetMarkAlignMode())
{
diff --git a/main/sw/source/ui/config/viewopt.cxx b/main/sw/source/ui/config/viewopt.cxx
index 408447e9fc..72e61b6ae3 100644
--- a/main/sw/source/ui/config/viewopt.cxx
+++ b/main/sw/source/ui/config/viewopt.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -223,25 +223,24 @@ SwViewOption::SwViewOption() :
{
// Initialisierung ist jetzt etwas einfacher
// alle Bits auf 0
- nCoreOptions =
- VIEWOPT_1_HARDBLANK |
+ nCoreOptions =
+ VIEWOPT_1_HARDBLANK |
VIEWOPT_1_SOFTHYPH |
VIEWOPT_1_REF |
VIEWOPT_1_GRAPHIC |
- VIEWOPT_1_TABLE |
- VIEWOPT_1_DRAW |
+ VIEWOPT_1_TABLE |
+ VIEWOPT_1_DRAW |
VIEWOPT_1_CONTROL |
VIEWOPT_1_PAGEBACK |
- VIEWOPT_1_SOLIDMARKHDL | // default is enhanced handles
VIEWOPT_1_POSTITS;
-
- nCore2Options =
- VIEWOPT_CORE2_BLACKFONT |
+
+ nCore2Options =
+ VIEWOPT_CORE2_BLACKFONT |
VIEWOPT_CORE2_HIDDENPARA |
VIEWOPT_CORE2_BIGMARKHDL; // default is big handles
-
- nUIOptions =
- VIEWOPT_2_MODIFIED |
+
+ nUIOptions =
+ VIEWOPT_2_MODIFIED |
VIEWOPT_2_GRFKEEPZOOM |
VIEWOPT_2_ANY_RULER;
diff --git a/main/sw/source/ui/inc/optpage.hxx b/main/sw/source/ui/inc/optpage.hxx
index a6520b8065..62ee33029a 100644
--- a/main/sw/source/ui/inc/optpage.hxx
+++ b/main/sw/source/ui/inc/optpage.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,19 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
#ifndef _OPTPAGE_HXX
#define _OPTPAGE_HXX
#include <sfx2/tabdlg.hxx>
@@ -61,7 +62,6 @@ class SwContentOptPage : public SfxTabPage
//visual aids
FixedLine aLineFL;
CheckBox aCrossCB;
- CheckBox aSolidHandleCB;
CheckBox aBigHandleCB;
//view