summaryrefslogtreecommitdiff
authorMiklos Vajna <vmiklos@suse.cz>2013-06-16 15:47:50 (GMT)
committer Miklos Vajna <vmiklos@suse.cz>2013-06-16 15:58:06 (GMT)
commit4c3d2dcdadbcb8f2ffc2caab07d50a286341df96 (patch) (side-by-side diff)
treeaa748068e99583613d4d8dae638c494f162c3a07
parenteb04af85a7f928564d29c4400d5c0ff1828f4304 (diff)
downloadcore-4c3d2dcdadbcb8f2ffc2caab07d50a286341df96.zip
core-4c3d2dcdadbcb8f2ffc2caab07d50a286341df96.tar.gz
Add UI for fine dashed border type
Commit 7d632ff29e601c2e680c4a689997fbf552592a4b added document model / layout support for this, but UI was lacking. First, add a new item to the list box in SvxBorderTabPage::FillLineListBox_Impl(). Second, handle MAP_TWIP unit in svtools::GetDashing() for STYLE_FINE_DASHED. Pick up some values that give visually the fine dashed result when painted. (The original values from 2f0d406911f9790a434e46bc82ea36bb8ae714e7 in other cases seem to be a bit consistent already anyway.) Change-Id: Ibf1ed235d51515b065d23a6a5d5eef433162899f
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cui/source/tabpages/border.cxx1
-rw-r--r--svtools/source/control/ctrlbox.cxx5
2 files changed, 6 insertions, 0 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 26f3a0c..f43fbae 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -993,6 +993,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
m_pLbLineStyle->InsertEntry( SvxBorderLine::getWidthImpl( SOLID ), SOLID );
m_pLbLineStyle->InsertEntry( SvxBorderLine::getWidthImpl( DOTTED ), DOTTED );
m_pLbLineStyle->InsertEntry( SvxBorderLine::getWidthImpl( DASHED ), DASHED );
+ m_pLbLineStyle->InsertEntry( SvxBorderLine::getWidthImpl( FINE_DASHED ), FINE_DASHED );
// Double lines
m_pLbLineStyle->InsertEntry( SvxBorderLine::getWidthImpl( DOUBLE ), DOUBLE );
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index a071cb2..dce1f9a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -643,6 +643,11 @@ namespace svtools
aPattern.push_back( 4 );
aPattern.push_back( 1 );
}
+ else if ( eUnit == MAP_TWIP )
+ {
+ aPattern.push_back( 120.0 );
+ aPattern.push_back( 30.0 );
+ }
break;
default:
break;