Skip to content

C
core
Kaydet (Commit) 8560fb88 authored tarafından Zolnai Tamás's avatar Zolnai Tamás
Dosyalara gözat
Seçenekler

Remove obsolote border dialog 

Change-Id: I57f3db05a21caeff04f280a0c13c3facfe23c3c1
üst df685a3f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 244 deletions
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
Dosyayı görüntüle @ 8560fb88
......@@ -829,14 +829,6 @@
<value xml:lang="en-US">Name...</value>
</prop>
</node>
<node oor:name=".uno:BorderDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Borders</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:PageColumnDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Page Columns</value>
......
sw/Library_swui.mk
Dosyayı görüntüle @ 8560fb88
......@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/frmdlg/frmdlg \
sw/source/ui/frmdlg/frmpage \
sw/source/ui/frmdlg/pattern \
sw/source/ui/frmdlg/uiborder \
sw/source/ui/frmdlg/wrap \
sw/source/ui/index/cntex \
sw/source/ui/index/cnttab \
......
sw/inc/cmdid.h
Dosyayı görüntüle @ 8560fb88
......@@ -323,7 +323,6 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_FORMAT_PAGE_SETTING_DLG (FN_FORMAT + 42) /* */
#define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* number format in table */
#define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* */
#define FN_FORMAT_PAGE_COLUMN_DLG (FN_FORMAT + 49) /* columns per page */
#define FN_FORMAT_BACKGROUND_DLG (FN_FORMAT + 50) /* background */
#define FN_FORMAT_PAGE_DLG (FN_FORMAT + 52) /* page */
......
sw/inc/dialog.hrc
Dosyayı görüntüle @ 8560fb88
......@@ -56,7 +56,6 @@
#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90)
#define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91)
#define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92)
#define RC_DLG_SWBORDERDLG (RC_DIALOG_BEGIN + 93)
#define RC_DLG_SWWRAPDLG (RC_DIALOG_BEGIN + 94)
#define RC_DLG_SWFLDEDITDLG (RC_DIALOG_BEGIN + 95)
// Ueberlaufpruefung ********************************************************
......
sw/inc/swabstdlg.hxx
Dosyayı görüntüle @ 8560fb88
......@@ -377,7 +377,6 @@ public:
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
sal_Bool bSetAutoFmt = sal_True,
const SwTableAutoFmt* pSelFmt = 0 ) = 0;
virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0;//add for SwBorderDlg
virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; //add for SwWrapDlg
virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; //add for SwTableWidthDlg
......
sw/sdi/_basesh.sdi
Dosyayı görüntüle @ 8560fb88
......@@ -275,11 +275,6 @@ interface BaseTextSelection
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
FN_FORMAT_BORDER_DLG // status(final|play)
[
ExecMethod = ExecDlg ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_BORDER_INNER // status()
[
......
sw/sdi/swriter.sdi
Dosyayı görüntüle @ 8560fb88
......@@ -623,31 +623,6 @@ SfxVoidItem SwBackspace FN_BACKSPACE
GroupId = GID_EDIT;
]
//--------------------------------------------------------------------------
SfxVoidItem BorderDialog FN_FORMAT_BORDER_DLG
()
[
/* flags: */
AutoUpdate = FALSE,
Cachable = Cachable,
FastCall = TRUE,
HasCoreId = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
/* config: */
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
SfxVoidItem BulletsAndNumberingDialog FN_NUMBER_BULLETS
()
......
sw/source/ui/dialog/swdlgfact.cxx
Dosyayı görüntüle @ 8560fb88
......@@ -59,7 +59,6 @@
#include "srtdlg.hxx" //add for SwSortDlg
#include "tautofmt.hxx" //add for SwAutoFormatDlg
#include "tblnumfm.hxx" //add for SwNumFmtDlg
#include "uiborder.hxx" //add for SwBorderDlg
#include "wrap.hxx" //add for SwWrapDlg
#include "colwd.hxx" //add for SwTableWidthDlg
#include "tabledlg.hxx" //add for SwTableTabDlg
......@@ -184,7 +183,7 @@ sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const
return pDlg->GetPara();
}
//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg SwFldEditDlg begin
//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwWrapDlg SwFldEditDlg begin
const SfxItemSet* SwAbstractSfxDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
......@@ -885,23 +884,6 @@ AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(Wi
return new AbstractSwAutoFormatDlg_Impl(pDlg);
}
SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType,int nResId )
{
SfxModalDialog* pDlg=NULL;
switch ( nResId )
{
case RC_DLG_SWBORDERDLG :
pDlg = new SwBorderDlg( pParent, rSet, nType );
break;
default:
break;
}
if ( pDlg )
return new SwAbstractSfxDialog_Impl( pDlg );
return 0;
}
SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId )
{
SfxModalDialog* pDlg=NULL;
......
sw/source/ui/dialog/swdlgfact.hxx
Dosyayı görüntüle @ 8560fb88
......@@ -84,7 +84,7 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
//add for SwInsertAbstractDlg end
// add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg SwWrapDlg SwBorderDlg, SwFldEditDlg begin
// add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg SwWrapDlg, SwFldEditDlg begin
class SfxNoLayoutSingleTabDialog;
class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
{
......@@ -93,7 +93,7 @@ class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
virtual void SetText( const OUString& rStr );
virtual OUString GetText() const;
};
// add for SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg SwNumFmtDlg SwWrapDlg SwBorderDlg, SwFldEditDlg end
// add for SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg SwNumFmtDlg SwWrapDlg, SwFldEditDlg end
// add for SwAsciiFilterDlg begin
class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg
......@@ -477,7 +477,6 @@ public:
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
sal_Bool bSetAutoFmt = sal_True,
const SwTableAutoFmt* pSelFmt = 0 );
virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType,int nResId );//add for SwBorderDlg
virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); //add for SwWrapDlg
virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc);
......
sw/source/ui/envelp/envfmt.cxx
Dosyayı görüntüle @ 8560fb88
......@@ -38,7 +38,6 @@
#include "swuipardlg.hxx"
#include <pattern.hxx>
#include <poolfmt.hxx>
#include <uiborder.hxx>
#include <uitool.hxx>
#include <envfmt.hrc>
......
sw/source/ui/frmdlg/frmui.src
Dosyayı görüntüle @ 8560fb88
......@@ -102,10 +102,6 @@ String STR_COLL_HEADER
{
Text [ en-US ] = " (Template: " ;
};
String STR_FRMUI_BORDER
{
Text [ en-US ] = "Borders" ;
};
String STR_FRMUI_PATTERN
{
Text [ en-US ] = "Background" ;
......
sw/source/ui/frmdlg/uiborder.cxx deleted 100644 → 0
Dosyayı görüntüle @ df685a3f
/* -*- 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 <svx/svxdlg.hxx>
#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>
#include <svl/itemset.hxx>
#include <svx/flagsdef.hxx>
#include <sfx2/tabdlg.hxx>
#include <svl/intitem.hxx>
#include "swtypes.hxx"
#include "uiborder.hxx"
#include "frmui.hrc"
SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) :
SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
{
SetText(SW_RESSTR(STR_FRMUI_BORDER));
// create TabPage
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER );
if ( fnCreatePage )
{
SfxTabPage* pNewPage = (*fnCreatePage)( this, rSet );
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType));
if(SW_BORDER_MODE_TABLE == nType)
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_HIDESHADOWCTL));
pNewPage->PageCreated(aSet);
SetTabPage(pNewPage);
}
}
SwBorderDlg::~SwBorderDlg()
{
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/inc/frmui.hrc
Dosyayı görüntüle @ 8560fb88
......@@ -45,7 +45,6 @@
#define STR_TOPPRT (STR_FRMDLG_BEGIN + 1)
#define STR_BORDER (STR_FRMDLG_BEGIN + 16)
#define STR_COLUMN (STR_FRMDLG_BEGIN + 17)
#define STR_CHAR (STR_FRMDLG_BEGIN + 19)
......
sw/source/ui/inc/uiborder.hxx deleted 100644 → 0
Dosyayı görüntüle @ df685a3f
/* -*- 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 _UIBORDER_HXX
#define _UIBORDER_HXX
#include <sfx2/basedlgs.hxx>
class Window;
class SfxItemSet;
class SwBorderDlg : public SfxNoLayoutSingleTabDialog
{
public:
// nType may be:
// SW_BORDER_MODE_PARA
// SW_BORDER_MODE_TABLE
// SW_BORDER_MODE_FRAME
SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType);
~SwBorderDlg();
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/shells/basesh.cxx
Dosyayı görüntüle @ 8560fb88
......@@ -2358,73 +2358,6 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
}
}
break;
case FN_FORMAT_BORDER_DLG:
{
SfxItemSet aSet( rSh.GetAttrPool(),
RES_BOX , RES_SHADOW,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
0 );
SfxAbstractDialog * pDlg = 0;
// Table cell(s) selected?
if ( rSh.IsTableMode() )
{
// Set border attributes Get/SetTabBorders()
::PrepareBoxInfo( aSet, rSh );
rSh.GetTabBorders( aSet );
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
pDlg = pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_TABLE, RC_DLG_SWBORDERDLG );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if ( pDlg->Execute() == RET_OK )
{
rSh.SetTabBorders( *pDlg->GetOutputItemSet() );
pOutSet = pDlg->GetOutputItemSet();
}
}
else if ( rSh.IsFrmSelected() )
{
// Set border attributes via Frame-Manager
SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
aSet.Put( aMgr.GetAttrSet() );
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
pDlg = pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_FRAME, RC_DLG_SWBORDERDLG );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if ( pDlg->Execute() == RET_OK )
{
aMgr.SetAttrSet( *pDlg->GetOutputItemSet() );
aMgr.UpdateFlyFrm();
pOutSet = pDlg->GetOutputItemSet();
}
}
else
{
// Set border attributes via Shell quite normal
rSh.GetCurAttr( aSet );
::PrepareBoxInfo( aSet, rSh );
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
pDlg = pFact->CreateSwBorderDlg( pMDI, aSet, SW_BORDER_MODE_PARA, RC_DLG_SWBORDERDLG );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if ( pDlg->Execute() == RET_OK )
{
rSh.SetAttr( *pDlg->GetOutputItemSet() );
pOutSet = pDlg->GetOutputItemSet();
}
}
if(pOutSet)
{
rReq.Done(*pOutSet);
bDone = true;
}
delete pDlg;
}
break;
case FN_FORMAT_BACKGROUND_DLG:
{
SfxItemSet aSet( rSh.GetAttrPool(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment