cui/source/tabpages/border.cxx | 4
dev/null |binary
include/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 4
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 8 -
sw/Library_swui.mk | 1
sw/inc/cmdid.h | 1
sw/inc/dialog.hrc | 1
sw/inc/swabstdlg.hxx | 1
sw/sdi/_basesh.sdi | 5
sw/sdi/swriter.sdi | 25 ---
sw/source/core/inc/swfont.hxx | 3
sw/source/core/layout/paintfrm.cxx | 16 +-
sw/source/ui/dialog/swdlgfact.cxx | 20 --
sw/source/ui/dialog/swdlgfact.hxx | 5
sw/source/ui/envelp/envfmt.cxx | 1
sw/source/ui/frmdlg/frmui.src | 4
sw/source/ui/frmdlg/uiborder.cxx | 65
---------
sw/source/ui/inc/frmui.hrc | 1
sw/source/ui/inc/uiborder.hxx | 42
------
sw/source/ui/shells/basesh.cxx | 67
----------
sw/source/ui/shells/textsh1.cxx | 19 +-
21 files changed, 22 insertions(+), 271 deletions(-)
New commits:
commit ea79b364499d7d9df06fb0cd048f53a38b95077b
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Tue Jul 9 12:41:33 2013 +0200
Decrease scope of some variable
Change-Id: I23319e09bf6c4c0e33b86edc225cdfaa0433b7c6
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index b19da71..6d99fd3 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4673,9 +4673,6 @@ static void lcl_PaintLeftRightLine( const bool
_bLeft,
{
pLeftRightBorder = bR2L ? rBox.GetLeft() : rBox.GetRight();
}
- // OD 06.05.2003 #107169# - init boolean indicating printer output device.
- const bool bPrtOutputDev =
- ( OUTDEV_PRINTER == pGlobalShell->GetOut()->GetOutDevType() );
if ( !pLeftRightBorder )
{
@@ -4694,9 +4691,7 @@ static void lcl_PaintLeftRightLine( const bool
_bLeft,
(aRect.*_rRectFn->fnGetWidth)() );
}
- const sal_Bool bCnt = _rFrm.IsCntntFrm();
-
- if ( bCnt )
+ if ( _rFrm.IsCntntFrm() )
{
::lcl_ExtendLeftAndRight( aRect, _rFrm, _rAttrs, _rRectFn );
@@ -4707,6 +4702,10 @@ static void lcl_PaintLeftRightLine( const bool
_bLeft,
if ( !pLeftRightBorder->GetInWidth() )
{
+ // OD 06.05.2003 #107169# - init boolean indicating printer output
device.
+ const bool bPrtOutputDev =
+ ( OUTDEV_PRINTER == pGlobalShell->GetOut()->GetOutDevType() );
+
// OD 06.05.2003 #107169# - add 6th parameter
::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn,
bPrtOutputDev );
}
@@ -4730,8 +4729,7 @@ static void lcl_PaintTopBottomLine( const bool
_bTop,
{
const SvxBoxItem& rBox = _rAttrs.GetBox();
const SvxBorderLine* pTopBottomBorder = 0;
- const SvxBorderLine* pLeftBorder = rBox.GetLeft();
- const SvxBorderLine* pRightBorder = rBox.GetRight();
+
if ( _bTop )
{
pTopBottomBorder = rBox.GetTop();
@@ -4761,7 +4759,7 @@ static void lcl_PaintTopBottomLine( const bool
_bTop,
if ( lcl_GetLineWidth( pTopBottomBorder ) > 0 )
{
lcl_MakeBorderLine(
- aRect, false, _bTop, *pTopBottomBorder, pLeftBorder, pRightBorder);
+ aRect, false, _bTop, *pTopBottomBorder, rBox.GetLeft(),
rBox.GetRight());
}
}
commit 3b7030d99580aa70dad884b1ac74924d9a179b3e
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Sun Jul 7 21:13:55 2013 +0200
Update comment
Change-Id: I26dd6b741b538da1c372534b55870c22ebd3d046
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index d03e749..c0f225e 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -37,9 +37,9 @@ namespace drawinglayer
/** BorderLinePrimitive2D class
This is the basic primitive to build frames around objects, e.g.
tables.
- It defines a single or double line from Start to nd using the
LeftWidth,
+ It defines a single or double line from Start to End using the
LeftWidth,
Distance and RightWidth definitions.
- The LineStart/End overlap is defined by the
Extend(Inner|Outer)(Start|End)
+ The LineStart/End overlap is defined by the
Extend(Left|Right)(Start|End)
definitions.
*/
class DRAWINGLAYER_DLLPUBLIC BorderLinePrimitive2D : public
BufferedDecompositionPrimitive2D
commit c83be01ded8090f0d7cdfe3f279b695f2307803e
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Sun Jul 7 20:24:11 2013 +0200
Remove useless private operator==() from SwFont
Change-Id: I7cbc6cc1c55afe0906cacda571c9ed8dd7fd8dd7
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 00a147d..a023dc2 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -62,7 +62,6 @@ class SwSubFont : public SvxFont
inline void CopyMagic( const SwSubFont& rFnt )
{ pMagic = rFnt.pMagic; nFntIndex = rFnt.nFntIndex; }
- sal_Bool operator==( const SwFont &rFnt ) const;
SwSubFont& operator=( const SwSubFont &rFont );
short _CheckKerning( );
@@ -144,8 +143,6 @@ class SwFont
sal_Bool bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie
sal_Bool bNoColReplace :1; // Replacement without colormanipulation
- sal_Bool operator==( const SwFont &rFnt ) const;
-
protected:
inline SwFont() { pBackColor = NULL; nActual = SW_LATIN; }
commit 979854a5fe7843ba4312285c5b245a89692e6c51
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Wed Jun 26 15:47:58 2013 +0200
Remove useless variable
Change-Id: I78004d9d74647ad9b87975204844cb2bb66a83fa
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 8a134520..4444d5a 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -887,8 +887,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
if ( !pPaM )
pPaM = rWrtSh.GetCrsr();
- bool bUseCurCrsr = true;
-
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView,
&GetView()));
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast<
sal_uInt16 >(eMetric)));
@@ -934,9 +932,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
aCoreSet.Put( aOff );
- // Setting the BoxInfo if based on the current cursor
- if ( bUseCurCrsr )
- ::PrepareBoxInfo( aCoreSet, rWrtSh );
+ // Setting the BoxInfo
+ ::PrepareBoxInfo( aCoreSet, rWrtSh );
// Current page format
::SwToSfxPageDescAttr( aCoreSet );
commit ca62ff029158cb8543d19324cc721773b2185e20
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Fri Jun 21 16:01:18 2013 +0200
Fix indentation
Change-Id: I4feae9998647694efaad776396aca2ce8f177152
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 5e4360d..8a134520 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -968,13 +968,13 @@ void SwTextShell::Execute(SfxRequest &rReq)
if ( !bUseDialog )
{
if ( nSlot == SID_ATTR_PARA_LRSPACE)
- {
- SvxLRSpaceItem aParaMargin((const
SvxLRSpaceItem&)pArgs->Get(nSlot));
- aParaMargin.SetWhich( RES_LR_SPACE);
- aCoreSet.Put(aParaMargin);
- pSet = &aCoreSet;
+ {
+ SvxLRSpaceItem aParaMargin((const
SvxLRSpaceItem&)pArgs->Get(nSlot));
+ aParaMargin.SetWhich( RES_LR_SPACE);
+ aCoreSet.Put(aParaMargin);
+ pSet = &aCoreSet;
- } else
+ } else
pSet = (SfxItemSet*) pArgs;
}
commit 8560fb88c7252e5ad60674e447f2e194298f08de
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Thu Jun 20 15:38:01 2013 +0200
Remove obsolote border dialog
Change-Id: I57f3db05a21caeff04f280a0c13c3facfe23c3c1
diff --git a/icon-themes/crystal/cmd/lc_borderdialog.png
b/icon-themes/crystal/cmd/lc_borderdialog.png
deleted file mode 100644
index c0ca4f6..0000000
Binary files a/icon-themes/crystal/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/sc_borderdialog.png
b/icon-themes/crystal/cmd/sc_borderdialog.png
deleted file mode 100644
index 6b6ab48..0000000
Binary files a/icon-themes/crystal/cmd/sc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/lc_borderdialog.png
b/icon-themes/galaxy/cmd/lc_borderdialog.png
deleted file mode 100644
index 0cd8935..0000000
Binary files a/icon-themes/galaxy/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/sc_borderdialog.png
b/icon-themes/galaxy/cmd/sc_borderdialog.png
deleted file mode 100644
index c8b915b..0000000
Binary files a/icon-themes/galaxy/cmd/sc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/hicontrast/cmd/lc_borderdialog.png
b/icon-themes/hicontrast/cmd/lc_borderdialog.png
deleted file mode 100644
index a61a1a6..0000000
Binary files a/icon-themes/hicontrast/cmd/lc_borderdialog.png and /dev/null
differ
diff --git a/icon-themes/hicontrast/cmd/sc_borderdialog.png
b/icon-themes/hicontrast/cmd/sc_borderdialog.png
deleted file mode 100644
index 6c65b36..0000000
Binary files a/icon-themes/hicontrast/cmd/sc_borderdialog.png and /dev/null
differ
diff --git a/icon-themes/human/cmd/lc_borderdialog.png
b/icon-themes/human/cmd/lc_borderdialog.png
deleted file mode 100644
index 323a8df..0000000
Binary files a/icon-themes/human/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/human/cmd/sc_borderdialog.png
b/icon-themes/human/cmd/sc_borderdialog.png
deleted file mode 100644
index d71ad45..0000000
Binary files a/icon-themes/human/cmd/sc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/lc_borderdialog.png
b/icon-themes/oxygen/cmd/lc_borderdialog.png
deleted file mode 100644
index c0ca4f6..0000000
Binary files a/icon-themes/oxygen/cmd/lc_borderdialog.png and /dev/null differ
diff --git a/icon-themes/oxygen/cmd/sc_borderdialog.png
b/icon-themes/oxygen/cmd/sc_borderdialog.png
deleted file mode 100644
index 6b6ab48..0000000
Binary files a/icon-themes/oxygen/cmd/sc_borderdialog.png and /dev/null differ
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index c8dc745..76ff150 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -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>
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index bec90c2..2f1d4bc 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -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 \
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index dee921d..94b8351 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -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 */
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 802a66f..902404f 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -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 ********************************************************
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 4f48dad..de82751 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -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
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index 4b87dab..060ec16 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -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()
[
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c5b7326..1949ecc 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -624,31 +624,6 @@ SfxVoidItem SwBackspace FN_BACKSPACE
]
//--------------------------------------------------------------------------
-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
()
[
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 16c61b1..1ebe8a4 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -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;
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index ff9ee11..7d77e7f 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -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);
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index b98334f..462290c 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -38,7 +38,6 @@
#include "swuipardlg.hxx"
#include <pattern.hxx>
#include <poolfmt.hxx>
-#include <uiborder.hxx>
#include <uitool.hxx>
#include <envfmt.hrc>
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index 0cf431b..679fc12 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -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" ;
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
deleted file mode 100644
index 2f4b1ef..0000000
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <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: */
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc
index 612a32b..cc03279 100644
--- a/sw/source/ui/inc/frmui.hrc
+++ b/sw/source/ui/inc/frmui.hrc
@@ -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)
diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx
deleted file mode 100644
index 20e5e87..0000000
--- a/sw/source/ui/inc/uiborder.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#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: */
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index ea1f6a6..67087fb 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -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(),
commit df685a3faacd5952ea6dca373c7f304dbfb43e4c
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Thu Jun 20 11:32:04 2013 +0200
Page border bug: margin edits are enable when no broder
To reproduce
1. Format -> Page
2. Set left and ritght borders only (All margins is editable)
4. Set inner margins bigger (using syncronize check box), for example 2 cm
5. Click OK
Result
Margin appaer just on the right and the left side, so just on those
sides where there is a border.
Expected:
Only the relevant edits must be enable on border tab page
just as in case of paragraph borders.
Note to fix:
Inner margin without border is used only for table, but not
for other objects (paragraph, page, frame)
Change-Id: Ie611eb29432cb7e75131154d94b4a8db1c3f1bb8
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index f43fbae..cf10d12 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1075,8 +1075,8 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
// for tables everything is allowed
sal_uInt16 nValid = VALID_TOP|VALID_BOTTOM|VALID_LEFT|VALID_RIGHT;
- // for border and paragraph the edit is disabled, if there's no border
set
- if(nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_PARA))
+ // for other objects (paragraph, page, frame) the edit is disabled, if
there's no border set
+ if(!(nSWMode & SW_BORDER_MODE_TABLE))
{
if(bLineSet)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
