sw/source/ui/table/tabledlg.cxx | 14 +++++++-------
sw/source/ui/table/tabledlg.hrc | 4 ++--
sw/source/ui/table/tabledlg.src | 18 +++++++++---------
3 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit c6189de19431869eafcba64428858ff5410f2a98
Author: Lior Kaplan <kaplanl...@gmail.com>
Date: Sun Oct 30 21:19:42 2011 +0100
rename TEXTDIRECTION variables to TEXTORIENTATION to represent the previous
string change
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 25bc3a8..695c849 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -106,8 +106,8 @@ SwFormatTablePage::SwFormatTablePage( Window* pParent,
const SfxItemSet& rSet )
aBottomMF(this, SW_RES( ED_BOTTOM_DIST )),
aPropertiesFL(this, SW_RES( FL_PROPERTIES )),
- aTextDirectionFT(this, SW_RES( FT_TEXTDIRECTION )),
- aTextDirectionLB(this, SW_RES( LB_TEXTDIRECTION )),
+ aTextDirectionFT(this, SW_RES( FT_TEXTORIENTATION )),
+ aTextDirectionLB(this, SW_RES( LB_TEXTORIENTATION )),
pTblData(0),
nSaveWidth(0),
@@ -1343,8 +1343,8 @@ SwTextFlowPage::SwTextFlowPage( Window* pParent,
aRepeatHeaderNF (this, SW_RES(NF_REPEAT_HEADER )),
aRepeatHeaderAfterFT (this),
aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF,
aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT),
- aTextDirectionFT(this, SW_RES(FT_TEXTDIRECTION )),
- aTextDirectionLB(this, SW_RES(LB_TEXTDIRECTION )),
+ aTextDirectionFT(this, SW_RES(FT_TEXTORIENTATION )),
+ aTextDirectionLB(this, SW_RES(LB_TEXTORIENTATION )),
aVertOrientFL (this, SW_RES(FL_VERT_ORIENT )),
aVertOrientFT(this, SW_RES(FT_VERTORIENT )),
@@ -1503,7 +1503,7 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
bModified |= 0 != rSet.Put(
SvxFrameDirectionItem(
(SvxFrameDirection)(sal_uLong)aTextDirectionLB.GetEntryData(aTextDirectionLB.GetSelectEntryPos())
- , FN_TABLE_BOX_TEXTDIRECTION));
+ , FN_TABLE_BOX_TEXTORIENTATION));
}
if(aVertOrientLB.GetSelectEntryPos() != aVertOrientLB.GetSavedValue())
@@ -1675,9 +1675,9 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet )
aRepeatHeaderNF.SetValue( nRep );
aRepeatHeaderNF.SaveValue();
}
- if ( rSet.GetItemState(FN_TABLE_BOX_TEXTDIRECTION) > SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState(FN_TABLE_BOX_TEXTORIENTATION) > SFX_ITEM_AVAILABLE )
{
- sal_uLong nDirection = ((const
SvxFrameDirectionItem&)rSet.Get(FN_TABLE_BOX_TEXTDIRECTION)).GetValue();
+ sal_uLong nDirection = ((const
SvxFrameDirectionItem&)rSet.Get(FN_TABLE_BOX_TEXTORIENTATION)).GetValue();
aTextDirectionLB.SelectEntryPos(aTextDirectionLB.GetEntryPos( (const
void*)nDirection ));
}
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
index f03aed6..3933cd3 100644
--- a/sw/source/ui/table/tabledlg.hrc
+++ b/sw/source/ui/table/tabledlg.hrc
@@ -58,8 +58,8 @@
#define WIN_REPEAT_HEADER 40
#define FL_HEADLINE 41
#define FL_PROPERTIES 42
-#define FT_TEXTDIRECTION 43
-#define LB_TEXTDIRECTION 44
+#define FT_TEXTORIENTATION 43
+#define LB_TEXTORIENTATION 44
#define BT_OK 100
#define BT_CANCEL 101
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 1ea1046..dbaa2a0 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -307,16 +307,16 @@ TabPage TP_FORMAT_TABLE
Hide = TRUE ;
Text [ en-US ] = "Properties";
};
- FixedText FT_TEXTDIRECTION
+ FixedText FT_TEXTORIENTATION
{
Pos = MAP_APPFONT ( 12 , 138 ) ;
Size = MAP_APPFONT ( 60 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "Text ~direction";
};
- ListBox LB_TEXTDIRECTION
+ ListBox LB_TEXTORIENTATION
{
- HelpID = "sw:ListBox:TP_FORMAT_TABLE:LB_TEXTDIRECTION";
+ HelpID = "sw:ListBox:TP_FORMAT_TABLE:LB_TEXTORIENTATION";
Border = TRUE ;
Pos = MAP_APPFONT ( 75 , 136 ) ;
Size = MAP_APPFONT ( 176 , 50 ) ;
@@ -733,15 +733,15 @@ TabPage TP_TABLE_TEXTFLOW
Pos = MAP_APPFONT ( 21 , 113 ) ;
Size = MAP_APPFONT ( 2 , 1 ) ;
};
- FixedText FT_TEXTDIRECTION
+ FixedText FT_TEXTORIENTATION
{
Pos = MAP_APPFONT ( 12 , 132 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "Text ~orientation" ;
};
- ListBox LB_TEXTDIRECTION
+ ListBox LB_TEXTORIENTATION
{
- HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION";
+ HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTORIENTATION";
Pos = MAP_APPFONT ( 85 , 130 ) ;
Size = MAP_APPFONT ( 163 , 50 ) ;
DropDown = TRUE;
commit 72e0dfc02e15ba82b4b4051d050f5aad046cfc2a
Author: Lior Kaplan <kaplanl...@gmail.com>
Date: Sun Oct 30 21:18:36 2011 +0100
Change strings to reflect text orientation not text directionlity
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 1a0fc0e..1ea1046 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -737,7 +737,7 @@ TabPage TP_TABLE_TEXTFLOW
{
Pos = MAP_APPFONT ( 12 , 132 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Text ~direction" ;
+ Text [ en-US ] = "Text ~orientation" ;
};
ListBox LB_TEXTDIRECTION
{
@@ -748,8 +748,8 @@ TabPage TP_TABLE_TEXTFLOW
Border = TRUE;
StringList [ en-US ] =
{
- < "Left-to-right" ; 0; > ;
- < "Right-to-left (vertical)" ; 2; > ;
+ < "horizontal" ; 0; > ;
+ < "vertical" ; 2; > ;
< "Use superordinate object settings" ; 4; > ;
};
};
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
