diff options
| author | Rishabh Kumar <kris.kr296@gmail.com> | 2016-06-07 16:58:20 +0530 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-28 19:37:44 +0000 |
| commit | 76585ae33f3ca75c05c0ccbf6a621b6e2d42bc00 (patch) | |
| tree | c33a276de22708658312fb3adefa50907518da17 /sw/source/uibase/shells | |
| parent | 6af8c9ef2de39b933274c96fd661d219b2bed8a3 (diff) | |
Convert Bitmap tab to Pattern tab
Change-Id: I5cf02f1889090539f7adb826483c91a1ef3c3925
Reviewed-on: https://gerrit.libreoffice.org/26015
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/frmsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/grfsh.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 0854306985f9..7d05b7260391 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -402,7 +402,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) //UUUU items to hand over XPropertyList things like // XColorList, XHatchList, XGradientList and XBitmapList // to the Area TabPage - SID_COLOR_TABLE, SID_BITMAP_LIST, // [10179 + SID_COLOR_TABLE, SID_PATTERN_LIST, // [10179 SID_HTML_MODE, SID_HTML_MODE, // [10414 FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, // [21032 diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index c5fee03511b7..e58869336da0 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -236,7 +236,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) //UUUU items to hand over XPropertyList things like // XColorList, XHatchList, XGradientList and XBitmapList // to the Area TabPage - SID_COLOR_TABLE, SID_BITMAP_LIST, // [10179 + SID_COLOR_TABLE, SID_PATTERN_LIST, // [10179 SID_HTML_MODE,SID_HTML_MODE, // [10414 FN_GET_PRINT_AREA,FN_GET_PRINT_AREA, // [21032 @@ -255,6 +255,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) aSet.Put(SvxGradientListItem(pDrawModel->GetGradientList(), SID_GRADIENT_LIST)); aSet.Put(SvxHatchListItem(pDrawModel->GetHatchList(), SID_HATCH_LIST)); aSet.Put(SvxBitmapListItem(pDrawModel->GetBitmapList(), SID_BITMAP_LIST)); + aSet.Put(SvxPatternListItem(pDrawModel->GetPatternList(), SID_PATTERN_LIST)); sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell()); aSet.Put(SfxUInt16Item(SID_HTML_MODE, nHtmlMode)); diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index e302b8f0e55d..e97993d1980d 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -846,7 +846,7 @@ SfxItemSet SwTextShell::CreateInsertFrameItemSet(SwFlyFrameAttrMgr& rMgr) SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, FN_SET_FRM_NAME, FN_SET_FRM_NAME, SID_HTML_MODE, SID_HTML_MODE, - SID_COLOR_TABLE, SID_BITMAP_LIST, + SID_COLOR_TABLE, SID_PATTERN_LIST, 0 }; diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 6e7d1645c196..510225f921f9 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -934,7 +934,7 @@ void SwTextShell::Execute(SfxRequest &rReq) //UUUU items to hand over XPropertyList things like // XColorList, XHatchList, XGradientList and XBitmapList // to the Area TabPage - SID_COLOR_TABLE, SID_BITMAP_LIST, // [10179 + SID_COLOR_TABLE, SID_PATTERN_LIST, // [10179 SID_HTML_MODE, SID_HTML_MODE, // [10414 SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM, // [10457 @@ -955,7 +955,7 @@ void SwTextShell::Execute(SfxRequest &rReq) aCoreSet.Put(SvxGradientListItem(pDrawModel->GetGradientList(), SID_GRADIENT_LIST)); aCoreSet.Put(SvxHatchListItem(pDrawModel->GetHatchList(), SID_HATCH_LIST)); aCoreSet.Put(SvxBitmapListItem(pDrawModel->GetBitmapList(), SID_BITMAP_LIST)); - + aCoreSet.Put(SvxPatternListItem(pDrawModel->GetPatternList(), SID_PATTERN_LIST)); aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell()))); |