summaryrefslogtreecommitdiff
path: root/sd/source/ui/docshell/docshel3.cxx
blob: f9c5eb47b5ee3691c5f445ae0708b9eb7c474a36 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
/* -*- 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 "Window.hxx"
#include "DrawDocShell.hxx"

#include "app.hrc"

#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>

#include <svx/ofaitem.hxx>
#include <svx/svxerr.hxx>
#include <svx/dialmgr.hxx>
#include <svl/srchitem.hxx>
#include <svl/languageoptions.hxx>
#include <svtools/langtab.hxx>
#include <svx/srchdlg.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxdlg.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/window.hxx>
#include <svl/style.hxx>
#include <svx/drawitem.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
#include <editeng/eeitem.hxx>
#include <com/sun/star/i18n/TextConversionOption.hpp>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>

#include "strings.hrc"
#include "glob.hrc"
#include "res_bmp.hrc"

#include "sdmod.hxx"
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "sdattr.hxx"
#include "fusearch.hxx"
#include "ViewShell.hxx"
#include "View.hxx"
#include "slideshow.hxx"
#include "fuhhconv.hxx"
#include <memory>

using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;

namespace sd {

static void lcl_setLanguageForObj( SdrObject *pObj, LanguageType nLang, bool bLanguageNone )
{
    const sal_uInt16 aLangWhichId_EE[3] =
    {
        EE_CHAR_LANGUAGE,
        EE_CHAR_LANGUAGE_CJK,
        EE_CHAR_LANGUAGE_CTL
    };

    if( bLanguageNone )
        nLang = LANGUAGE_NONE;

    if( nLang != LANGUAGE_DONTKNOW )
    {
        if( nLang == LANGUAGE_NONE )
        {
            for(sal_uInt16 n : aLangWhichId_EE)
                pObj->SetMergedItem( SvxLanguageItem( nLang, n ) );
        }
        else
        {
            sal_uInt16 nLangWhichId = 0;
            SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( nLang );
            switch (nScriptType)
            {
                case SvtScriptType::LATIN :    nLangWhichId = EE_CHAR_LANGUAGE; break;
                case SvtScriptType::ASIAN :    nLangWhichId = EE_CHAR_LANGUAGE_CJK; break;
                case SvtScriptType::COMPLEX :  nLangWhichId = EE_CHAR_LANGUAGE_CTL; break;
                default:
                    OSL_FAIL("unexpected case" );
                    return;
            }
            pObj->SetMergedItem( SvxLanguageItem( nLang, nLangWhichId ) );
        }
    }
    else    // Reset to default
    {
        for(sal_uInt16 n : aLangWhichId_EE)
            pObj->ClearMergedItem( n );
    }
}

static void lcl_setLanguage( const SdDrawDocument *pDoc, const OUString &rLanguage, bool bLanguageNone = false )
{
    LanguageType nLang = SvtLanguageTable::GetLanguageType( rLanguage );

    // Do it for SdDrawDocument->SetLanguage as well?

    sal_uInt16 nPageCount = pDoc->GetPageCount();   // Pick All Pages
    for( sal_uInt16 nPage = 0; nPage < nPageCount; nPage++ )
    {
        const SdrPage *pPage = pDoc->GetPage( nPage );
        const size_t nObjCount = pPage->GetObjCount();
        for( size_t nObj = 0; nObj < nObjCount; ++nObj )
        {
            SdrObject *pObj = pPage->GetObj( nObj );
            if (pObj->GetObjIdentifier() != OBJ_PAGE)
                lcl_setLanguageForObj( pObj, nLang, bLanguageNone );
        }
    }
}

/**
 * Handles SFX-Requests
 */
void DrawDocShell::Execute( SfxRequest& rReq )
{
    if(mpViewShell && SlideShow::IsRunning( mpViewShell->GetViewShellBase() ))
    {
        // during a running presentation no slot will be executed
        return;
    }

    switch ( rReq.GetSlot() )
    {
        case SID_SEARCH_ITEM:
        {
            const SfxItemSet* pReqArgs = rReq.GetArgs();

            if (pReqArgs)
            {
                const SvxSearchItem* pSearchItem = static_cast<const SvxSearchItem*>( &pReqArgs->Get(SID_SEARCH_ITEM) );

                // would be nice to have an assign operation at SearchItem
                SvxSearchItem* pAppSearchItem = SD_MOD()->GetSearchItem();
                delete pAppSearchItem;
                pAppSearchItem = static_cast<SvxSearchItem*>( pSearchItem->Clone() );
                SD_MOD()->SetSearchItem(pAppSearchItem);
            }

            rReq.Done();
        }
        break;

        case FID_SEARCH_ON:
        {
            // no action needed
            rReq.Done();
        }
        break;

        case FID_SEARCH_OFF:
        {
            if( dynamic_cast< FuSearch* >(mxDocShellFunction.get()) )
            {
                // End Search&Replace in all docshells
                SfxObjectShell* pFirstShell = SfxObjectShell::GetFirst();
                SfxObjectShell* pShell = pFirstShell;

                while (pShell)
                {
                    if( dynamic_cast< const DrawDocShell *>( pShell ) !=  nullptr)
                    {
                        static_cast<DrawDocShell*>(pShell)->CancelSearching();
                    }

                    pShell = SfxObjectShell::GetNext(*pShell);

                    if (pShell == pFirstShell)
                    {
                        pShell = nullptr;
                    }
                }

                SetDocShellFunction(nullptr);
                Invalidate();
                rReq.Done();
            }
        }
        break;

        case FID_SEARCH_NOW:
        {
            const SfxItemSet* pReqArgs = rReq.GetArgs();

            if ( pReqArgs )
            {
                rtl::Reference< FuSearch > xFuSearch( dynamic_cast< FuSearch* >( GetDocShellFunction().get() ) );

                if( !xFuSearch.is() && mpViewShell )
                {
                    ::sd::View* pView = mpViewShell->GetView();
                    SetDocShellFunction( FuSearch::Create( mpViewShell, mpViewShell->GetActiveWindow(), pView, mpDoc, rReq ) );
                    xFuSearch.set( dynamic_cast< FuSearch* >( GetDocShellFunction().get() ) );
                }

                if( xFuSearch.is() )
                {
                    const SvxSearchItem* pSearchItem =
                        static_cast<const SvxSearchItem*>( &pReqArgs->Get(SID_SEARCH_ITEM) );

                    // would be nice to have an assign operation at SearchItem
                    SvxSearchItem* pAppSearchItem = SD_MOD()->GetSearchItem();
                    delete pAppSearchItem;
                    pAppSearchItem = static_cast<SvxSearchItem*>( pSearchItem->Clone() );
                    SD_MOD()->SetSearchItem(pAppSearchItem);
                    xFuSearch->SearchAndReplace(pSearchItem);
                }
            }

            rReq.Done();
        }
        break;

        case SID_CLOSEDOC:
        {
            ExecuteSlot(rReq, SfxObjectShell::GetStaticInterface());
        }
        break;

        case SID_GET_COLORLIST:
        {
            const SvxColorListItem* pColItem = static_cast<const SvxColorListItem*>( GetItem( SID_COLOR_TABLE ) );
            XColorListRef pList = pColItem->GetColorList();
            rReq.SetReturnValue( OfaRefItem<XColorList>( SID_GET_COLORLIST, pList ) );
        }
        break;

        case SID_VERSION:
        {
            const SdrSwapGraphicsMode nOldSwapMode = mpDoc->GetSwapGraphicsMode();

            mpDoc->SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP );
            ExecuteSlot( rReq, SfxObjectShell::GetStaticInterface() );
            mpDoc->SetSwapGraphicsMode( nOldSwapMode );
        }
        break;

        case SID_HANGUL_HANJA_CONVERSION:
        {
            if( mpViewShell )
            {
                rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create( mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), mpDoc, rReq ) );
                static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, nullptr, i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true );
            }
        }
        break;

        case SID_CHINESE_CONVERSION:
        {
            if( mpViewShell )
            {
                rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create( mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), mpDoc, rReq ) );
                static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartChineseConversion();
            }
        }
        break;
        case SID_LANGUAGE_STATUS:
        {
            OUString aNewLangTxt;
            const SfxStringItem* pItem = rReq.GetArg<SfxStringItem>(SID_LANGUAGE_STATUS);
            if (pItem)
                aNewLangTxt = pItem->GetValue();
            if (aNewLangTxt == "*" )
            {
                // open the dialog "Tools/Options/Language Settings - Language"
                SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
                if (pFact && mpViewShell)
                {
                    ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( mpViewShell->GetActiveWindow(), SID_LANGUAGE_OPTIONS ));
                    pDlg->Execute();
                }
            }
            else
            {
                if( mpViewShell )
                {
                    // setting the new language...
                    if (!aNewLangTxt.isEmpty())
                    {
                        const OUString aDocumentLangPrefix("Default_");
                        const OUString aStrNone("LANGUAGE_NONE");
                        const OUString aStrResetLangs("RESET_LANGUAGES");
                        SdDrawDocument* pDoc = mpViewShell->GetDoc();
                        sal_Int32 nPos = -1;
                        if (-1 != (nPos = aNewLangTxt.indexOf( aDocumentLangPrefix )))
                        {
                            aNewLangTxt = aNewLangTxt.replaceAt( nPos, aDocumentLangPrefix.getLength(), "" );
                        }
                        else
                        {
                            break;
                        }
                        if (aNewLangTxt == aStrNone)
                            lcl_setLanguage( pDoc, OUString(), true );
                        else if (aNewLangTxt == aStrResetLangs)
                            lcl_setLanguage( pDoc, OUString() );
                        else
                            lcl_setLanguage( pDoc, aNewLangTxt );

                        mpViewShell->GetFrame()->GetBindings().Invalidate( SID_LANGUAGE_STATUS );

                        if ( pDoc->GetOnlineSpell() )
                        {
                            pDoc->StartOnlineSpelling();
                        }
                    }
                }
            }
        }
        break;

        case SID_NOTEBOOKBAR:
        {
            const SfxStringItem* pFile = rReq.GetArg<SfxStringItem>( SID_NOTEBOOKBAR );

            if ( mpViewShell )
            {
                SfxBindings& rBindings( mpViewShell->GetFrame()->GetBindings() );

                if ( sfx2::SfxNotebookBar::IsActive() )
                    sfx2::SfxNotebookBar::ExecMethod( rBindings, pFile ? pFile->GetValue() : "" );
                else
                    sfx2::SfxNotebookBar::CloseMethod( rBindings );
            }
        }
        break;

        default:
        break;
    }
}

void DrawDocShell::SetDocShellFunction( const rtl::Reference<FuPoor>& xFunction )
{
    if( mxDocShellFunction.is() )
        mxDocShellFunction->Dispose();

    mxDocShellFunction = xFunction;
}

} // end of namespace sd

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
tyle='width: 22.2%;'/> -rw-r--r--testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt20
-rw-r--r--testautomation/global/sid/bars.sid1
-rw-r--r--testautomation/global/win/bars.win1
-rw-r--r--testautomation/global/win/tab_h_o.win5
57 files changed, 71 insertions, 300 deletions
diff --git a/default_images/cmd/lc_bighandles.png b/default_images/cmd/lc_bighandles.png
deleted file mode 100644
index c884cc22e4c1..000000000000
--- a/default_images/cmd/lc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/default_images/cmd/sc_bighandles.png b/default_images/cmd/sc_bighandles.png
deleted file mode 100644
index 1224eec04f94..000000000000
--- a/default_images/cmd/sc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/filter/source/xslt/import/uof/uof2odf_presentation.xsl b/filter/source/xslt/import/uof/uof2odf_presentation.xsl
index 8e03235c63bc..3c9c569e022a 100644
--- a/filter/source/xslt/import/uof/uof2odf_presentation.xsl
+++ b/filter/source/xslt/import/uof/uof2odf_presentation.xsl
@@ -37,7 +37,6 @@
<config:config-item config:name="PageKind" config:type="short">0</config:config-item>
<config:config-item config:name="SelectedPage" config:type="short">0</config:config-item>
<config:config-item config:name="IsLayerMode" config:type="boolean">false</config:config-item>
- <config:config-item config:name="IsBigHandles" config:type="boolean">false</config:config-item>
<config:config-item config:name="IsDoubleClickTextEdit" config:type="boolean">true</config:config-item>
<config:config-item config:name="IsClickChangeRotation" config:type="boolean">false</config:config-item>
<config:config-item config:name="SlidesPerRow" config:type="short">4</config:config-item>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 84649499c29e..d97348ec5917 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1525,15 +1525,6 @@
<value xml:lang="en-US">24 Bit True Color</value>
</prop>
</node>
- <node oor:name=".uno:BigHandles" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
-
- <value xml:lang="en-US">Large Handles</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:DoubleClickTextEdit" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index 0cb2ee0eab74..14509143d360 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -364,17 +364,6 @@
</info>
<value>true</value>
</prop>
- <prop oor:name="BigHandles" oor:type="xs:boolean">
- <!-- OldPath: Draw/Other -->
- <!-- OldLocation: soffice.cfg -->
- <!-- UIHints: Optionbar -->
- <info>
- <author>AF</author>
- <desc>Indicates whether to show big (true) or small (false) handles.</desc>
- <label>Big Handles</label>
- </info>
- <value>true</value>
- </prop>
<prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
<!-- OldPath: Draw/Other -->
<!-- OldLocation: soffice.cfg -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 2876a2909308..1b549d66b29b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -408,16 +408,6 @@
</info>
<value>true</value>
</prop>
- <prop oor:name="BigHandles" oor:type="xs:boolean">
- <!-- OldPath: Impress/Other -->
- <!-- OldLocation: soffice.cfg -->
- <!-- UIHints: Optionbar -->
- <info>
- <desc>Indicates whether to show big (true) or small (false) handles.</desc>
- <label>Big Handles</label>
- </info>
- <value>true</value>
- </prop>
<prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
<!-- OldPath: Impress/Other -->
<!-- OldLocation: soffice.cfg -->
diff --git a/ooo_custom_images/crystal/cmd/lc_bighandles.png b/ooo_custom_images/crystal/cmd/lc_bighandles.png
deleted file mode 100644
index e6c894d43357..000000000000
--- a/ooo_custom_images/crystal/cmd/lc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/crystal/cmd/sc_bighandles.png b/ooo_custom_images/crystal/cmd/sc_bighandles.png
deleted file mode 100644
index e0756c49f240..000000000000
--- a/ooo_custom_images/crystal/cmd/sc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/hicontrast/cmd/lc_bighandles.png b/ooo_custom_images/hicontrast/cmd/lc_bighandles.png
deleted file mode 100644
index 5878ddf58108..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_bighandles.png b/ooo_custom_images/hicontrast/cmd/sc_bighandles.png
deleted file mode 100644
index 879e51c5d898..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/human/cmd/lc_bighandles.png b/ooo_custom_images/human/cmd/lc_bighandles.png
deleted file mode 100644
index c694b0a71093..000000000000
--- a/ooo_custom_images/human/cmd/lc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/human/cmd/sc_bighandles.png b/ooo_custom_images/human/cmd/sc_bighandles.png
deleted file mode 100644
index 7388a6a13f1b..000000000000
--- a/ooo_custom_images/human/cmd/sc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/industrial/cmd/lc_bighandles.png b/ooo_custom_images/industrial/cmd/lc_bighandles.png
deleted file mode 100644
index c694b0a71093..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/industrial/cmd/sc_bighandles.png b/ooo_custom_images/industrial/cmd/sc_bighandles.png
deleted file mode 100644
index 7388a6a13f1b..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_bighandles.png b/ooo_custom_images/oxygen/cmd/lc_bighandles.png
deleted file mode 100644
index e6c894d43357..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_bighandles.png b/ooo_custom_images/oxygen/cmd/sc_bighandles.png
deleted file mode 100644
index e0756c49f240..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_bighandles.png
+++ /dev/null
Binary files differ
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 63d244b9ac8e..0c763cefb697 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -56,8 +56,7 @@ enum ScViewOption
VOPT_HELPLINES,
VOPT_ANCHOR,
VOPT_PAGEBREAKS,
- VOPT_CLIPMARKS,
- VOPT_BIGHANDLES
+ VOPT_CLIPMARKS
};
enum ScVObjType
@@ -67,7 +66,7 @@ enum ScVObjType
VOBJ_TYPE_DRAW
};
-#define MAX_OPT (sal_uInt16)VOPT_BIGHANDLES+1
+#define MAX_OPT (sal_uInt16)VOPT_CLIPMARKS+1
#define MAX_TYPE (sal_uInt16)VOBJ_TYPE_DRAW+1
#define SC_STD_GRIDCOLOR COL_LIGHTGRAY
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 41a59cb223b2..cf763b07ea83 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -152,7 +152,6 @@ void ScViewOptions::SetDefaults()
aOptArr[ VOPT_SYNTAX ] =
aOptArr[ VOPT_HELPLINES ] =
aOptArr[ VOPT_GRID_ONTOP ] =
- aOptArr[ VOPT_BIGHANDLES ] = false;
aOptArr[ VOPT_NOTES ] =
aOptArr[ VOPT_NULLVALS ] =
aOptArr[ VOPT_VSCROLL ] =
@@ -299,8 +298,6 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
#define SCLAYOUTOPT_GRIDCOLOR 1
#define SCLAYOUTOPT_PAGEBREAK 2
#define SCLAYOUTOPT_GUIDE 3
-#define SCLAYOUTOPT_SIMPLECONT 4
-#define SCLAYOUTOPT_LARGECONT 5
#define SCLAYOUTOPT_COLROWHDR 6
#define SCLAYOUTOPT_HORISCROLL 7
#define SCLAYOUTOPT_VERTSCROLL 8
@@ -345,8 +342,6 @@ Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
"Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR
"Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK
"Line/Guide", // SCLAYOUTOPT_GUIDE
- "Line/SimpleControlPoint", // SCLAYOUTOPT_SIMPLECONT
- "Line/LargeControlPoint", // SCLAYOUTOPT_LARGECONT
"Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR
"Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL
"Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL
@@ -454,9 +449,6 @@ ScViewCfg::ScViewCfg() :
case SCLAYOUTOPT_GUIDE:
SetOption( VOPT_HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
- case SCLAYOUTOPT_LARGECONT:
- SetOption( VOPT_BIGHANDLES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
- break;
case SCLAYOUTOPT_COLROWHDR:
SetOption( VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
@@ -621,9 +613,6 @@ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG )
case SCLAYOUTOPT_GUIDE:
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HELPLINES ) );
break;
- case SCLAYOUTOPT_LARGECONT:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_BIGHANDLES ) );
- break;
case SCLAYOUTOPT_COLROWHDR:
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HEADER ) );
break;
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 5b74ebe4c656..15c32cf8d98a 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -154,7 +154,6 @@
#define GB_TAB 64
#define MF_TAB 65
#define CB_PAGEBREAKS 66
-#define CB_BIGHANDLES 68
#define FT_TAB 69
#define FT_UNIT 70
#define FL_SEPARATOR1 71
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 260ee38d297e..015b9177a33f 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -53,7 +53,6 @@ class ScTpContentOptions : public SfxTabPage
ColorListBox aColorLB;
CheckBox aBreakCB;
CheckBox aGuideLineCB;
- CheckBox aBigHandleCB;
FixedLine aSeparator1FL;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index d52514df8d13..c237288e1b9b 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -66,7 +66,6 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aColorLB( this, ScResId(LB_COLOR )),
aBreakCB( this, ScResId(CB_PAGEBREAKS )),
aGuideLineCB( this, ScResId(CB_GUIDELINE )),
- aBigHandleCB( this, ScResId(CB_BIGHANDLES )),
aSeparator1FL (this, ScResId(FL_SEPARATOR1 )),
aDisplayGB( this, ScResId(GB_DISPLAY)),
@@ -122,7 +121,6 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aOutlineCB .SetClickHdl(aCBHdl);
aBreakCB .SetClickHdl(aCBHdl);
aGuideLineCB.SetClickHdl(aCBHdl);
- aBigHandleCB.SetClickHdl(aCBHdl);
aRowColHeaderCB.SetClickHdl(aCBHdl);
}
@@ -158,8 +156,7 @@ sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
aOutlineCB .GetSavedValue() != aOutlineCB .IsChecked() ||
aColorLB .GetSavedValue() != aColorLB .GetSelectEntryPos() ||
aBreakCB .GetSavedValue() != aBreakCB .IsChecked() ||
- aGuideLineCB .GetSavedValue() != aGuideLineCB .IsChecked() ||
- aBigHandleCB .GetSavedValue() != aBigHandleCB .IsChecked())
+ aGuideLineCB .GetSavedValue() != aGuideLineCB .IsChecked())
{
pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
aColorLB.GetSelectEntry() );
@@ -210,7 +207,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
- aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
aRangeFindCB.Check(((const SfxBoolItem*)pItem)->GetValue());
@@ -238,7 +234,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aColorLB .SaveValue();
aBreakCB .SaveValue();
aGuideLineCB .SaveValue();
- aBigHandleCB .SaveValue();
}
void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
@@ -288,7 +283,6 @@ 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 ( &aBigHandleCB == pBtn ) eOption = VOPT_BIGHANDLES;
else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER;
pLocalOptions->SetOption( eOption, bChecked );
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index b70900e4715e..93378d13b1c9 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -497,13 +497,6 @@ TabPage RID_SCPAGE_CONTENT
Size = MAP_APPFONT ( 112 , 10 ) ;
Text [ en-US ] = "Helplines ~While Moving";
};
- CheckBox CB_BIGHANDLES
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES";
- Pos = MAP_APPFONT ( 12 , 84 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "~Large handles";
- };
FixedLine FL_SEPARATOR1
{
Pos = MAP_APPFONT ( 130 , 14 ) ;
@@ -566,20 +559,20 @@ TabPage RID_SCPAGE_CONTENT
};
FixedLine GB_OBJECT
{
- Pos = MAP_APPFONT ( 6 , 100 ) ;
+ Pos = MAP_APPFONT ( 6 , 72 ) ;
Size = MAP_APPFONT ( 121 , 8 ) ;
Text [ en-US ] = "Objects" ;
};
FixedText FT_OBJGRF
{
- Pos = MAP_APPFONT ( 12 , 113 ) ;
+ Pos = MAP_APPFONT ( 12 , 85 ) ;
Size = MAP_APPFONT ( 68 , 8 ) ;
Text [ en-US ] = "Ob~jects/Graphics" ;
};
ListBox LB_OBJGRF
{
HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_OBJGRF";
- Pos = MAP_APPFONT ( 84 , 111 ) ;
+ Pos = MAP_APPFONT ( 84 , 83 ) ;
Size = MAP_APPFONT ( 40 , 46 ) ;
Border = TRUE ;
DropDown = TRUE ;
@@ -591,14 +584,14 @@ TabPage RID_SCPAGE_CONTENT
};
FixedText FT_DIAGRAM
{
- Pos = MAP_APPFONT ( 12 , 129 ) ;
+ Pos = MAP_APPFONT ( 12 , 101 ) ;
Size = MAP_APPFONT ( 68 , 8 ) ;
Text [ en-US ] = "Cha~rts" ;
};
ListBox LB_DIAGRAM
{
HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DIAGRAM";
- Pos = MAP_APPFONT ( 84 , 127 ) ;
+ Pos = MAP_APPFONT ( 84 , 99 ) ;
Size = MAP_APPFONT ( 40 , 46 ) ;
Border = TRUE ;
DropDown = TRUE ;
@@ -611,14 +604,14 @@ TabPage RID_SCPAGE_CONTENT
};
FixedText FT_DRAW
{
- Pos = MAP_APPFONT ( 12 , 145 ) ;
+ Pos = MAP_APPFONT ( 12 , 117 ) ;
Size = MAP_APPFONT ( 68 , 8 ) ;
Text [ en-US ] = "~Drawing objects" ;
};
ListBox LB_DRAW
{
HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DRAW";
- Pos = MAP_APPFONT ( 84 , 143 ) ;
+ Pos = MAP_APPFONT ( 84 , 115 ) ;
Size = MAP_APPFONT ( 40 , 46 ) ;
Border = TRUE ;
DropDown = TRUE ;
@@ -631,14 +624,14 @@ TabPage RID_SCPAGE_CONTENT
};
FixedLine GB_ZOOM
{
- Pos = MAP_APPFONT ( 6 , 160 ) ;
+ Pos = MAP_APPFONT ( 6 , 132 ) ;
Size = MAP_APPFONT ( 121 , 8 ) ;
Text [ en-US ] = "Zoom";
};
CheckBox CB_SYNCZOOM
{
HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_SYNCZOOM";
- Pos = MAP_APPFONT ( 12 , 171 ) ;
+ Pos = MAP_APPFONT ( 12 , 143 ) ;
Size = MAP_APPFONT ( 112 , 10 ) ;
Text [ en-US ] = "S~ynchronize sheets" ;
};
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index cb4f3ac61d2c..2243e7507146 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -70,7 +70,6 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
#define SC_HANDLESIZE_BIG 9
-#define SC_HANDLESIZE_SMALL 7
// -----------------------------------------------------------------------
@@ -552,10 +551,8 @@ void ScDrawView::UpdateUserViewOptions()
const ScViewOptions& rOpt = pViewData->GetOptions();
const ScGridOptions& rGrid = rOpt.GetGridOptions();
- sal_Bool bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES );
-
SetDragStripes( rOpt.GetOption( VOPT_HELPLINES ) );
- SetMarkHdlSizePixel( bBigHdl ? SC_HANDLESIZE_BIG : SC_HANDLESIZE_SMALL );
+ SetMarkHdlSizePixel( SC_HANDLESIZE_BIG );
SetGridVisible( rGrid.GetGridVisible() );
SetSnapEnabled( rGrid.GetUseGridSnap() );
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index b34d4033c4a0..00880e69d7fa 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -232,7 +232,6 @@
#define SID_CONVERT_TO_8BIT_GRAYS (SID_SD_START+165)
#define SID_CONVERT_TO_8BIT_COLORS (SID_SD_START+166)
#define SID_CONVERT_TO_24BIT (SID_SD_START+167)
-#define SID_BIG_HANDLES (SID_SD_START+168)
#define SID_DOUBLECLICK_TEXTEDIT (SID_SD_START+169)
#define SID_CLICK_CHANGE_ROTATION (SID_SD_START+170)
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index cad54f82be13..c9aff5db5d5c 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -40,7 +40,6 @@
#define CMD_SID_MOREBACK ".uno:Backward"
#define CMD_SID_BEFORE_OBJ ".uno:BeforeObject"
#define CMD_SID_BEHIND_OBJ ".uno:BehindObject"
-#define CMD_SID_BIG_HANDLES ".uno:BigHandles"
#define CMD_SID_BREAK ".uno:Break"
#define CMD_SID_CAPTUREPOINT ".uno:CapturePoint"
#define CMD_SID_CHANGEBEZIER ".uno:ChangeBezier"
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index f668a66ed57b..018e7d01f7bc 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1989,11 +1989,6 @@ interface DrawView
ExecMethod = ExecOptionsBar ;
StateMethod = GetOptionsBarState ;
]
- SID_BIG_HANDLES // ole : ?, status : ?
- [
- ExecMethod = ExecOptionsBar ;
- StateMethod = GetOptionsBarState ;
- ]
SID_DOUBLECLICK_TEXTEDIT // ole : ?, status : ?
[
ExecMethod = ExecOptionsBar ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 425915bcbd00..4b6ddae0d53b 100755
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -288,33 +288,6 @@ SfxVoidItem BehindObject SID_BEHIND_OBJ
]
//--------------------------------------------------------------------------
-SfxBoolItem BigHandles SID_BIG_HANDLES
-
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_OPTIONS;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem Break SID_BREAK
()
[
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index f4f0ffc9ce4c..b3b8cd7b60fc 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -494,7 +494,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
bMasterPageCache( sal_True ),
bDragWithCopy( sal_False ),
bPickThrough( sal_True ),
- bBigHandles( sal_False ),
bDoubleClickTextEdit( sal_True ),
bClickChangeRotation( sal_False ),
bStartWithActualPage( sal_False ),
@@ -529,7 +528,6 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
IsMasterPagePaintCaching() == rOpt.IsMasterPagePaintCaching() &&
IsDragWithCopy() == rOpt.IsDragWithCopy() &&
IsPickThrough() == rOpt.IsPickThrough() &&
- IsBigHandles() == rOpt.IsBigHandles() &&
IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
IsStartWithActualPage() == rOpt.IsStartWithActualPage() &&
@@ -563,7 +561,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
"BackgroundCache",
"CopyWhileMoving",
"TextObject/Selectable",
- "BigHandles",
"DclickTextedit",
"RotateClick",
"Preview",
@@ -592,7 +589,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
"PenWidth"
};
- rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 26 : 15 );
+ rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 25 : 14 );
ppNames = aPropNames;
}
@@ -606,49 +603,48 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[3].hasValue() ) SetMasterPagePaintCaching( *(sal_Bool*) pValues[ 3 ].getValue() );
if( pValues[4].hasValue() ) SetDragWithCopy( *(sal_Bool*) pValues[ 4 ].getValue() );
if( pValues[5].hasValue() ) SetPickThrough( *(sal_Bool*) pValues[ 5 ].getValue() );
- if( pValues[6].hasValue() ) SetBigHandles( *(sal_Bool*) pValues[ 6 ].getValue() );
- if( pValues[7].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 7 ].getValue() );
- if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 8 ].getValue() );
- if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10 ].getValue() );
- if( pValues[11].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 11 ].getValue() );
- if( pValues[12].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 12 ].getValue() );
- if( pValues[13].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 13 ].getValue() );
+ if( pValues[6].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 6 ].getValue() );
+ if( pValues[7].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 7 ].getValue() );
+ if( pValues[9].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 9 ].getValue() );
+ if( pValues[10].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 10 ].getValue() );
+ if( pValues[11].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 11 ].getValue() );
+ if( pValues[12].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 12 ].getValue() );
- if( pValues[14].hasValue() )
- SetShowComments( *(sal_Bool*) pValues[ 14 ].getValue() );
+ if( pValues[13].hasValue() )
+ SetShowComments( *(sal_Bool*) pValues[ 13 ].getValue() );
// just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
+ if( pValues[14].hasValue() )
+ SetStartWithTemplate( *(sal_Bool*) pValues[ 14 ].getValue() );
if( pValues[15].hasValue() )
- SetStartWithTemplate( *(sal_Bool*) pValues[ 15 ].getValue() );
+ SetStartWithActualPage( *(sal_Bool*) pValues[ 15 ].getValue() );
if( pValues[16].hasValue() )
- SetStartWithActualPage( *(sal_Bool*) pValues[ 16 ].getValue() );
+ SetSummationOfParagraphs( *(sal_Bool*) pValues[ 16 ].getValue() );
if( pValues[17].hasValue() )
- SetSummationOfParagraphs( *(sal_Bool*) pValues[ 17 ].getValue() );
+ SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 17 ].getValue() );
+
if( pValues[18].hasValue() )
- SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 18 ].getValue() );
+ SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 18 ].getValue());
if( pValues[19].hasValue() )
- SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 19 ].getValue());
+ SetPreviewNewEffects(*(sal_Bool*) pValues[ 19 ].getValue());
if( pValues[20].hasValue() )
- SetPreviewNewEffects(*(sal_Bool*) pValues[ 20 ].getValue());
+ SetPreviewChangedEffects(*(sal_Bool*) pValues[ 20 ].getValue());
if( pValues[21].hasValue() )
- SetPreviewChangedEffects(*(sal_Bool*) pValues[ 21 ].getValue());
+ SetPreviewTransitions(*(sal_Bool*) pValues[ 21 ].getValue());
if( pValues[22].hasValue() )
- SetPreviewTransitions(*(sal_Bool*) pValues[ 22 ].getValue());
+ SetDisplay(*(sal_Int32*) pValues[ 22 ].getValue());
if( pValues[23].hasValue() )
- SetDisplay(*(sal_Int32*) pValues[ 23 ].getValue());
+ SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 23 ] ) );
if( pValues[24].hasValue() )
- SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 24 ] ) );
-
- if( pValues[25].hasValue() )
- SetPresentationPenWidth( getSafeValue< double >( pValues[ 25 ] ) );
+ SetPresentationPenWidth( getSafeValue< double >( pValues[ 24 ] ) );
}
return sal_True;
@@ -664,34 +660,33 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 3 ] <<= IsMasterPagePaintCaching();
pValues[ 4 ] <<= IsDragWithCopy();
pValues[ 5 ] <<= IsPickThrough();
- pValues[ 6 ] <<= IsBigHandles();
- pValues[ 7 ] <<= IsDoubleClickTextEdit();
- pValues[ 8 ] <<= IsClickChangeRotation();
+ pValues[ 6 ] <<= IsDoubleClickTextEdit();
+ pValues[ 7 ] <<= IsClickChangeRotation();
// The preview is not supported anymore. Use a dummy value.
- pValues[ 9 ] <<= (double)0;// GetPreviewQuality();
- pValues[ 10 ] <<= IsSolidDragging();
- pValues[ 11 ] <<= GetDefaultObjectSizeWidth();
- pValues[ 12 ] <<= GetDefaultObjectSizeHeight();
- pValues[ 13 ] <<= GetPrinterIndependentLayout();
- pValues[ 14 ] <<= (sal_Bool)IsShowComments();
+ pValues[ 8 ] <<= (double)0;// GetPreviewQuality();
+ pValues[ 9 ] <<= IsSolidDragging();
+ pValues[ 10 ] <<= GetDefaultObjectSizeWidth();
+ pValues[ 11 ] <<= GetDefaultObjectSizeHeight();
+ pValues[ 12 ] <<= GetPrinterIndependentLayout();
+ pValues[ 13 ] <<= (sal_Bool)IsShowComments();
// just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
- pValues[ 15 ] <<= IsStartWithTemplate();
- pValues[ 16 ] <<= IsStartWithActualPage();
- pValues[ 17 ] <<= IsSummationOfParagraphs();
- pValues[ 18 ] <<= IsShowUndoDeleteWarning();
- pValues[ 19 ] <<= IsSlideshowRespectZOrder();
+ pValues[ 14 ] <<= IsStartWithTemplate();
+ pValues[ 15 ] <<= IsStartWithActualPage();
+ pValues[ 16 ] <<= IsSummationOfParagraphs();
+ pValues[ 17 ] <<= IsShowUndoDeleteWarning();
+ pValues[ 18 ] <<= IsSlideshowRespectZOrder();
- pValues[ 20 ] <<= IsPreviewNewEffects();
- pValues[ 21 ] <<= IsPreviewChangedEffects();
- pValues[ 22 ] <<= IsPreviewTransitions();
+ pValues[ 19 ] <<= IsPreviewNewEffects();
+ pValues[ 20 ] <<= IsPreviewChangedEffects();
+ pValues[ 21 ] <<= IsPreviewTransitions();
- pValues[ 23 ] <<= GetDisplay();
+ pValues[ 22 ] <<= GetDisplay();
- pValues[ 24 ] <<= GetPresentationPenColor();
- pValues[ 25 ] <<= GetPresentationPenWidth();
+ pValues[ 23 ] <<= GetPresentationPenColor();
+ pValues[ 24 ] <<= GetPresentationPenWidth();
}
return sal_True;
@@ -748,7 +743,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
maOptionsMisc.SetDragWithCopy( pView->IsDragWithCopy() );
maOptionsMisc.SetPickThrough( (sal_Bool)pView->GetModel()->IsPickThroughTransparentTextFrames() );
- maOptionsMisc.SetBigHandles( (sal_Bool)pView->IsBigHandles() );
maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() );
maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() );
maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() );
@@ -762,7 +756,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
maOptionsMisc.SetMasterPagePaintCaching( pOpts->IsMasterPagePaintCaching() );
maOptionsMisc.SetDragWithCopy( pOpts->IsDragWithCopy() );
maOptionsMisc.SetPickThrough( pOpts->IsPickThrough() );
- maOptionsMisc.SetBigHandles( pOpts->IsBigHandles() );
maOptionsMisc.SetDoubleClickTextEdit( pOpts->IsDoubleClickTextEdit() );
maOptionsMisc.SetClickChangeRotation( pOpts->IsClickChangeRotation() );
maOptionsMisc.SetSolidDragging( pOpts->IsSolidDragging() );
@@ -800,7 +793,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
pOpts->SetMasterPagePaintCaching( maOptionsMisc.IsMasterPagePaintCaching() );
pOpts->SetDragWithCopy( maOptionsMisc.IsDragWithCopy() );
pOpts->SetPickThrough( maOptionsMisc.IsPickThrough() );
- pOpts->SetBigHandles( maOptionsMisc.IsBigHandles() );
pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() );
pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() );
pOpts->SetStartWithActualPage( maOptionsMisc.IsStartWithActualPage() );
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src
index 5ec5d2305231..87e461ad2138 100644
--- a/sd/source/ui/app/tbxids_tmpl.src
+++ b/sd/source/ui/app/tbxids_tmpl.src
@@ -501,14 +501,6 @@
AutoCheck = TRUE ; \
};
-#define TBI_BIG_HANDLES \
- ToolBoxItem\
- {\
- Identifier = SID_BIG_HANDLES ; \
- HelpID = SID_BIG_HANDLES ; \
- AutoCheck = TRUE ; \
- };
-
#define TBI_SOLID_CREATE \
ToolBoxItem\
{\
diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src
index b9bdaf4800de..f8539c2daa1e 100644
--- a/sd/source/ui/app/toolbox2_tmpl.src
+++ b/sd/source/ui/app/toolbox2_tmpl.src
@@ -224,7 +224,6 @@ ToolBox RID_GRAPHIC_OPTIONS_TOOLBOX
TBI_PICK_THROUGH
TBI_DOUBLECLICK_TEXTEDIT
SEPARATOR
- TBI_BIG_HANDLES
#if SD_TOOLBOX != RID_DRAW_TOOLBOX
TBI_SOLID_CREATE
#endif
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx
index 838e0d05ea73..c6ffd22a9afa 100644
--- a/sd/source/ui/inc/FrameView.hxx
+++ b/sd/source/ui/inc/FrameView.hxx
@@ -135,9 +135,6 @@ public:
{ mbQuickEdit = bQEdit; }
sal_Bool IsQuickEdit() const { return mbQuickEdit; }
- void SetBigHandles( sal_Bool bOn = sal_True ) { mbBigHandles = bOn; }
- sal_Bool IsBigHandles() const { return mbBigHandles; }
-
void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { mbDoubleClickTextEdit = bOn; }
sal_Bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; }
@@ -209,7 +206,6 @@ private:
EditMode meEditModeOnLoad;
sal_Bool mbLayerMode; // Layer an/aus
sal_Bool mbQuickEdit; // QuickEdit an/aus
- sal_Bool mbBigHandles; // Grosse Handles
sal_Bool mbDoubleClickTextEdit; // Textmodus nach Doppelklick
sal_Bool mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus
sal_uInt16 mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 36c9aac36c07..8eb5ae6d620d 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -260,7 +260,6 @@ private:
sal_Bool bMasterPageCache : 1; // Misc/BackgroundCache
sal_Bool bDragWithCopy : 1; // Misc/CopyWhileMoving
sal_Bool bPickThrough : 1; // Misc/TextObject/Selectable
- sal_Bool bBigHandles : 1; // Misc/BigHandles
sal_Bool bDoubleClickTextEdit : 1; // Misc/DclickTextedit
sal_Bool bClickChangeRotation : 1; // Misc/RotateClick
sal_Bool bStartWithActualPage : 1; // Misc/Start/CurrentPage
@@ -309,7 +308,6 @@ public:
sal_Bool IsMasterPagePaintCaching() const { Init(); return (sal_Bool) bMasterPageCache; }
sal_Bool IsDragWithCopy() const { Init(); return (sal_Bool) bDragWithCopy; }
sal_Bool IsPickThrough() const { Init(); return (sal_Bool) bPickThrough; }
- sal_Bool IsBigHandles() const { Init(); return (sal_Bool) bBigHandles; }
sal_Bool IsDoubleClickTextEdit() const { Init(); return (sal_Bool) bDoubleClickTextEdit; }
sal_Bool IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; }
sal_Bool IsStartWithActualPage() const { Init(); return (sal_Bool) bStartWithActualPage; }
@@ -348,7 +346,6 @@ public:
void SetMasterPagePaintCaching( sal_Bool bOn = sal_True ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } }
void SetDragWithCopy( sal_Bool bOn = sal_True ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } }
void SetPickThrough( sal_Bool bOn = sal_True ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } }
- void SetBigHandles( sal_Bool bOn = sal_True ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } }
void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } }
void SetClickChangeRotation( sal_Bool bOn = sal_True ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } }
void SetStartWithActualPage( sal_Bool bOn = sal_True ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } }
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 298dff72754e..56f3f936fa16 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -156,7 +156,6 @@ SD_CONSTASCII_ACTION( sUNO_View_PageKind, "PageKind" );
SD_CONSTASCII_ACTION( sUNO_View_SelectedPage, "SelectedPage" );
SD_CONSTASCII_ACTION( sUNO_View_IsLayerMode, "IsLayerMode" );
SD_CONSTASCII_ACTION( sUNO_View_IsQuickEdit, "IsQuickEdit" );
-SD_CONSTASCII_ACTION( sUNO_View_IsBigHandles, "IsBigHandles" );
SD_CONSTASCII_ACTION( sUNO_View_IsDoubleClickTextEdit, "IsDoubleClickTextEdit" );
SD_CONSTASCII_ACTION( sUNO_View_IsClickChangeRotation, "IsClickChangeRotation" );
SD_CONSTASCII_ACTION( sUNO_View_IsDragWithCopy, "IsDragWithCopy" );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 8e6fa0c9c159..9f1c3b7ebbc5 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx