Kill internationaloptions page, it has been unused for years.

Change-Id: Ia528bf60a8af81b17ca18ad5eb305bed59818d05

cui/AllLangResTarget_cui.mk

@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/options/connpooloptions.src \
     cui/source/options/dbregister.src \
     cui/source/options/doclinkdialog.src \
-    cui/source/options/internationaloptions.src \
     cui/source/options/optchart.src \
     cui/source/options/optcolor.src \
     cui/source/options/optdict.src \

cui/Library_cui.mk

@@ -134,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/options/dbregistersettings \
     cui/source/options/doclinkdialog \
     cui/source/options/fontsubs \
-    cui/source/options/internationaloptions \
 	cui/source/options/optaboutconfig \
     cui/source/options/optaccessibility \
     cui/source/options/optasian \

cui/source/factory/dlgfact.cxx

@@ -36,7 +36,6 @@
 #include "textanim.hxx"
 #include "autocdlg.hxx"
 #include "treeopt.hxx"
-#include "internationaloptions.hxx"
 #include "labdlg.hxx"
 #include "hangulhanjadlg.hxx"
 #include "showcols.hxx"
@@ -1706,11 +1705,6 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId
 {
     switch ( nId )
     {
-        case RID_OFA_TP_INTERNATIONAL:
-            return ::offapp::InternationalOptionsPage::CreateSc;
-        case RID_OFA_TP_INTERNATIONAL_SD:
-        case RID_OFA_TP_INTERNATIONAL_IMPR:
-            return offapp::InternationalOptionsPage::CreateSd;
         case RID_SVXPAGE_TEXTANIMATION :
             return SvxTextAnimationPage::Create;
         case RID_SVXTABPAGE_GALLERY_GENERAL :

cui/source/inc/internationaloptions.hxx

-/* -*- 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 .
- */
-
-#ifndef _OFFAPP_INTERNATIONALOPTIONS_HXX_
-#define _OFFAPP_INTERNATIONALOPTIONS_HXX_
-
-#include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-
-namespace offapp
-{
-    class InternationalOptionsPage : public SfxTabPage
-    {
-    private:
-        struct IMPL;
-        IMPL*               m_pImpl;
-
-    protected:
-                            InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet );
-
-        virtual sal_Bool        FillItemSet( SfxItemSet& _rSet );
-        virtual void        Reset( const SfxItemSet& _rSet );
-
-    public:
-        virtual             ~InternationalOptionsPage();
-
-        static SfxTabPage*  CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet );
-        static SfxTabPage*  CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet );
-    };
-
-}   // /namespace offapp
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/options/internationaloptions.cxx

-/* -*- 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 "internationaloptions.hxx"
-#include "internationaloptions.hrc"
-#include <svl/eitem.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include <dialmgr.hxx>
-#include <svx/dialogs.hrc>
-
-namespace offapp
-{
-
-    struct InternationalOptionsPage::IMPL
-    {
-        FixedLine           m_aFL_DefaultTextDirection;
-        RadioButton         m_aRB_TxtDirLeft2Right;
-        RadioButton         m_aRB_TxtDirRight2Left;
-        FixedLine           m_aFL_SheetView;
-        CheckBox            m_aCB_ShtVwRight2Left;
-        CheckBox            m_aCB_ShtVwCurrentDocOnly;
-
-        sal_Bool                m_bEnable_SheetView_Opt : 1;
-
-        inline              IMPL( Window* _pParent );
-
-        inline void         EnableOption_SheetView( sal_Bool _bEnable = sal_True );
-        void                ShowOption_SheetView( sal_Bool _bShow = sal_True );
-
-        sal_Bool                FillItemSet( SfxItemSet& _rSet );
-        void                Reset( const SfxItemSet& _rSet );
-    };
-
-    inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) :
-        m_aFL_DefaultTextDirection  ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) )
-        ,m_aRB_TxtDirLeft2Right     ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) )
-        ,m_aRB_TxtDirRight2Left     ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) )
-        ,m_aFL_SheetView            ( _pParent, CUI_RES( FL_SHEETVIEW ) )
-        ,m_aCB_ShtVwRight2Left      ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) )
-        ,m_aCB_ShtVwCurrentDocOnly  ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) )
-
-        ,m_bEnable_SheetView_Opt    ( sal_False )
-    {
-        ShowOption_SheetView( m_bEnable_SheetView_Opt );
-    }
-
-    inline void InternationalOptionsPage::IMPL::EnableOption_SheetView( sal_Bool _bEnable )
-    {
-        if( m_bEnable_SheetView_Opt != _bEnable )
-        {
-            ShowOption_SheetView( _bEnable );
-
-            m_bEnable_SheetView_Opt = _bEnable;
-        }
-    }
-
-    void InternationalOptionsPage::IMPL::ShowOption_SheetView( sal_Bool _bShow )
-    {
-        m_aFL_SheetView.Show( _bShow );
-        m_aCB_ShtVwRight2Left.Show( _bShow );
-        m_aCB_ShtVwCurrentDocOnly.Show( _bShow );
-    }
-
-    sal_Bool InternationalOptionsPage::IMPL::FillItemSet( SfxItemSet& _rSet )
-    {
-        DBG_ASSERT( _rSet.GetPool(), "-InternationalOptionsPage::FillItemSet(): no pool gives rums!" );
-
-        // handling of DefaultTextDirection stuff
-        _rSet.Put(  SfxBoolItem(    _rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ),
-                                    m_aRB_TxtDirLeft2Right.IsChecked() ),
-                    SID_ATTR_PARA_LEFT_TO_RIGHT );
-
-        return sal_True;
-    }
-
-    void InternationalOptionsPage::IMPL::Reset( const SfxItemSet& _rSet )
-    {
-        // handling of DefaultTextDirection stuff
-        const SfxBoolItem*  pLeft2RightItem = static_cast< const SfxBoolItem* >( GetItem( _rSet, SID_ATTR_PARA_LEFT_TO_RIGHT ) );
-
-        DBG_ASSERT( pLeft2RightItem, "+InternationalOptionsPage::Reset(): SID_ATTR_PARA_LEFT_TO_RIGHT not set!" );
-
-        sal_Bool                bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : sal_True;
-        m_aRB_TxtDirLeft2Right.Check( bLeft2Right );
-
-    }
-
-    InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) :
-        SfxTabPage  ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
-
-        ,m_pImpl    ( new IMPL( this ) )
-    {
-        FreeResource();
-    }
-
-    SfxTabPage* InternationalOptionsPage::CreateSd( Window* _pParent, const SfxItemSet& _rAttrSet )
-    {
-        return new InternationalOptionsPage( _pParent, _rAttrSet );
-    }
-
-    SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet )
-    {
-        InternationalOptionsPage*   p = new InternationalOptionsPage( _pParent, _rAttrSet );
-        return p;
-    }
-
-    InternationalOptionsPage::~InternationalOptionsPage()
-    {
-        DELETEZ( m_pImpl );
-    }
-
-    sal_Bool InternationalOptionsPage::FillItemSet( SfxItemSet& _rSet )
-    {
-        return m_pImpl->FillItemSet( _rSet );
-    }
-
-    void InternationalOptionsPage::Reset( const SfxItemSet& _rSet )
-    {
-        m_pImpl->Reset( _rSet );
-    }
-
-}   // namespace offapp
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/options/internationaloptions.src

-/* -*- 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 "internationaloptions.hrc"
-#include "helpid.hrc"
-#include <cuires.hrc>
-#include <svx/dialogs.hrc>
-
-TabPage RID_OFA_TP_INTERNATIONAL
-{
-    HelpID = "cui:TabPage:RID_OFA_TP_INTERNATIONAL";
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-
-    FixedLine FL_DEFTXTDIRECTION
-    {
-        Pos = MAP_APPFONT( COL_0, ROW_0 );
-        Size = MAP_APPFONT( WIDTH2END( COL_0 ), HEIGHT_FL );
-        Text [ en-US ] = "Default text direction";
-    };
-
-    RadioButton RB_TXTDIR_LEFT2RIGHT
-    {
-        HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_LEFT2RIGHT";
-        Pos = MAP_APPFONT( COL_1, ROW_1 );
-        Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
-        Group = TRUE;
-        Text [ en-US ] = "~Left-to-right";
-    };
-
-    RadioButton RB_TXTDIR_RIGHT2LEFT
-    {
-        HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_RIGHT2LEFT";
-        Pos = MAP_APPFONT( COL_1, ROW_2 );
-        Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
-        Text [ en-US ] = "~Right-to-left";
-    };
-
-    FixedLine FL_SHEETVIEW
-    {
-        Pos = MAP_APPFONT( COL_0, ROW_3 );
-        Size = MAP_APPFONT( WIDTH2END( COL_0 ), HEIGHT_FL );
-        Text [ en-US ] = "Sheet view";
-    };
-
-    CheckBox CB_SHTVW_RIGHT2LEFT
-    {
-        HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_RIGHT2LEFT";
-        Pos = MAP_APPFONT( COL_1, ROW_4 );
-        Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_CB );
-        Text [ en-US ] = "Right-~to-left";
-    };
-
-    CheckBox CB_SHTVW_CURRENTDOCONLY
-    {
-        HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_CURRENTDOCONLY";
-        Pos = MAP_APPFONT( COL_2, ROW_5 );
-        Size = MAP_APPFONT( WIDTH2END( COL_2 ), HEIGHT_CB );
-        Text [ en-US ] = "~Current document only";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/options/treeopt.cxx

@@ -398,7 +398,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
     { "Calc",               NULL,                   SID_SC_EDITOPTIONS },
     { "Calc",               "General",              SID_SC_TP_LAYOUT },
     { "Calc",               "View",                 SID_SC_TP_CONTENT },
-    { "Calc",               "International",        RID_OFA_TP_INTERNATIONAL },
     { "Calc",               "Calculate",            SID_SC_TP_CALC },
     { "Calc",               "Formula",              SID_SC_TP_FORMULA },
     { "Calc",               "SortLists",            SID_SC_TP_USERLISTS },
@@ -1679,10 +1678,8 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                     nPageId = (sal_uInt16)rCalcArray.GetValue(i);
                     if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         continue;
-//                  if( bCTL || nId != RID_OFA_TP_INTERNATIONAL )
-//                  #103755# if an international tabpage is need one day, this should be used again... ;-)
-                    if ( nPageId != RID_OFA_TP_INTERNATIONAL )
-                        AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup );
+
+                    AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup );
                 }
             }
         }
@@ -1699,15 +1696,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                 ResStringArray& rImpressArray = aDlgResource.GetImpressArray();
                 setGroupName( "Impress", rImpressArray.GetString(0) );
                 nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS );
-                const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled();
                 const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rImpressArray.Count() );
                 for ( i = 1; i < nCount; ++i )
                 {
                     nPageId = (sal_uInt16)rImpressArray.GetValue(i);
                     if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         continue;
-                    if ( bCTL || nPageId != RID_OFA_TP_INTERNATIONAL_IMPR )
-                        AddTabPage( nPageId, rImpressArray.GetString(i), nGroup );
+
+                    AddTabPage( nPageId, rImpressArray.GetString(i), nGroup );
                 }
             }
         }
@@ -1723,15 +1719,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                 ResStringArray& rDrawArray = aDlgResource.GetDrawArray();
                 setGroupName( "Draw", rDrawArray.GetString(0) );
                 nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS );
-                const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled();
                 const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rDrawArray.Count() );
                 for ( i = 1; i < nCount; ++i )
                 {
                     nPageId = (sal_uInt16)rDrawArray.GetValue(i);
                     if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         continue;
-                    if ( bCTL || nPageId != RID_OFA_TP_INTERNATIONAL_SD )
-                        AddTabPage( nPageId, rDrawArray.GetString(i), nGroup );
+
+                    AddTabPage( nPageId, rDrawArray.GetString(i), nGroup );
                 }
             }
         }

cui/source/options/treeopt.src

@@ -179,7 +179,6 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
             < "General" ;           SID_SC_TP_LAYOUT            ;> ;
             < "Defaults" ;          RID_SC_TP_DEFAULTS          ;> ;
             < "View" ;          SID_SC_TP_CONTENT           ;> ;
-            < "International" ;     RID_OFA_TP_INTERNATIONAL    ;> ;
             < "Calculate" ;         SID_SC_TP_CALC              ;> ;
             < "Formula" ;       SID_SC_TP_FORMULA ;> ;
             < "Sort Lists" ;        SID_SC_TP_USERLISTS         ;> ;

include/svx/dialogs.hrc

@@ -146,9 +146,6 @@
 #define SID_SD_TP_CONTENTS              (RID_OFA_START + 225)
 #define SID_SD_TP_SNAP                  (RID_OFA_START + 227)
 #define SID_SD_TP_MISC                  (RID_OFA_START + 231)
-#define RID_OFA_TP_INTERNATIONAL_SD     (RID_OFA_START + 253)
-#define RID_OFA_TP_INTERNATIONAL_IMPR   (RID_OFA_START + 254)
-#define RID_OFA_TP_INTERNATIONAL        (RID_OFA_START + 252) // calc
 #define RID_SC_TP_DEFAULTS              (RID_OFA_START + 253)
 
 //---------------------------------------------------------------------

sc/source/ui/app/scmod.cxx

@@ -2206,17 +2206,6 @@ SfxTabPage*  ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const Sfx
                     pRet = (*ScTpDefaultsOptionsCreate)( pParent, rSet);
             }
             break;
-
-        case RID_OFA_TP_INTERNATIONAL:
-        {
-            SfxAbstractDialogFactory* pSfxFact = SfxAbstractDialogFactory::Create();
-            if ( pSfxFact )
-            {
-                ::CreateTabPage fnCreatePage = pSfxFact->GetTabPageCreatorFunc( nId );
-                if ( fnCreatePage )
-                    pRet = (*fnCreatePage)( pParent, rSet );
-            }
-        }
     }
 
     OSL_ENSURE( pRet, "ScModule::CreateTabPage(): no valid ID for TabPage!" );

sd/source/ui/app/sdmod2.cxx

@@ -765,8 +765,6 @@ SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI
                 }
             }
             break;
-            case RID_OFA_TP_INTERNATIONAL_SD:
-            case RID_OFA_TP_INTERNATIONAL_IMPR:
             case RID_SVXPAGE_TEXTANIMATION :
             {
                 SfxAbstractDialogFactory* pSfxFact = SfxAbstractDialogFactory::Create();

svx/source/src/app.hrc

@@ -110,9 +110,6 @@
 #define OFA_TP_HELPERPROG               (RID_OFA_START + 249)
 #define OFA_TP_MEMORY                   (RID_OFA_START + 250)
 #define RID_SW_TP_STD_FONT_CTL          (RID_OFA_START + 251)
-#define RID_OFA_TP_INTERNATIONAL        (RID_OFA_START + 252)       // 4 SC & ID 4 resource
-#define RID_OFA_TP_INTERNATIONAL_SD     (RID_OFA_START + 253)       // 4 SD
-#define RID_OFA_TP_INTERNATIONAL_IMPR   (RID_OFA_START + 254)       // 4 impress
 #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
 #define RID_SW_TP_OPTCAPTION_PAGE       (RID_OFA_START + 256)
 #define SID_SC_TP_FORMULA               (RID_OFA_START + 257)