diff options
Diffstat (limited to 'sw/source/ui/utlui')
-rw-r--r-- | sw/source/ui/utlui/attrdesc.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/condedit.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/utlui/content.cxx | 28 | ||||
-rw-r--r-- | sw/source/ui/utlui/glbltree.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/utlui/initui.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/utlui/navicfg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/navipi.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/utlui/prcntfld.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/swrenamexnameddlg.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/utlui/uitool.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/unotools.cxx | 65 | ||||
-rw-r--r-- | sw/source/ui/utlui/viewlayoutctrl.cxx | 2 |
12 files changed, 63 insertions, 67 deletions
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index b2bf48511783..4c2e5d572066 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -1115,7 +1115,7 @@ SfxItemPresentation SwGammaGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - rtl::OUStringBuffer aText; + OUStringBuffer aText; switch( ePres ) { case SFX_ITEM_PRESENTATION_NAMELESS: diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index f9859f4e2267..4dc9956f91ff 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -23,7 +23,6 @@ #include <condedit.hxx> #include <svx/dbaexchange.hxx> using namespace ::svx; -using ::rtl::OUString; using namespace ::com::sun::star::uno; // STATIC DATA diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 2ba3e048753d..4b71f62d8e49 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -214,7 +214,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) { case CONTENT_TYPE_OUTLINE : { - sTypeToken = rtl::OUString::createFromAscii(pMarkToOutline); + sTypeToken = OUString::createFromAscii(pMarkToOutline); sal_uInt16 nOutlineCount = nMemberCount = static_cast<sal_uInt16>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount()); if(nOutlineLevel < MAXLEVEL) @@ -230,7 +230,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) break; case CONTENT_TYPE_TABLE : - sTypeToken = rtl::OUString::createFromAscii(pMarkToTable); + sTypeToken = OUString::createFromAscii(pMarkToTable); nMemberCount = pWrtShell->GetTblFrmFmtCount(true); bEdit = true; break; @@ -240,16 +240,16 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) case CONTENT_TYPE_OLE : { FlyCntType eType = FLYCNTTYPE_FRM; - sTypeToken = rtl::OUString::createFromAscii(pMarkToFrame); + sTypeToken = OUString::createFromAscii(pMarkToFrame); if(nContentType == CONTENT_TYPE_OLE) { eType = FLYCNTTYPE_OLE; - sTypeToken = rtl::OUString::createFromAscii(pMarkToOLE); + sTypeToken = OUString::createFromAscii(pMarkToOLE); } else if(nContentType == CONTENT_TYPE_GRAPHIC) { eType = FLYCNTTYPE_GRF; - sTypeToken = rtl::OUString::createFromAscii(pMarkToGraphic); + sTypeToken = OUString::createFromAscii(pMarkToGraphic); } nMemberCount = pWrtShell->GetFlyCount(eType); bEdit = true; @@ -317,7 +317,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } } nMemberCount = pMember->size(); - sTypeToken = rtl::OUString::createFromAscii(pMarkToRegion); + sTypeToken = OUString::createFromAscii(pMarkToRegion); bEdit = true; bDelete = false; if(pOldMember) @@ -642,10 +642,10 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged) break; case CONTENT_TYPE_REFERENCE: { - std::vector<rtl::OUString> aRefMarks; + std::vector<OUString> aRefMarks; nMemberCount = pWrtShell->GetRefMarks( &aRefMarks ); - for(std::vector<rtl::OUString>::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i) + for(std::vector<OUString>::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i) { // References sorted alphabetically SwContent* pCnt = new SwContent(this, *i, 0); @@ -785,7 +785,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged) SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), - sSpace(rtl::OUString(" ")), + sSpace(OUString(" ")), sRemoveIdx(SW_RES(ST_REMOVE_INDEX)), sUpdateIdx(SW_RES(ST_UPDATE)), @@ -990,9 +990,9 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) if(pHiddenShell) { String sHiddenEntry = pHiddenShell->GetView().GetDocShell()->GetTitle(); - sHiddenEntry += rtl::OUString(" ( "); + sHiddenEntry += OUString(" ( "); sHiddenEntry += aContextStrings[ ST_HIDDEN - ST_CONTEXT_FIRST]; - sHiddenEntry += rtl::OUString(" )"); + sHiddenEntry += OUString(" )"); pSubPop3->InsertItem(nId, sHiddenEntry); } @@ -2465,7 +2465,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) if(((SwContent*)pUserData)->IsInvisible()) { if(sEntry.Len()) - sEntry += rtl::OUString(", "); + sEntry += OUString(", "); sEntry += sInvisible; bRet = true; } @@ -2897,11 +2897,11 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode) String sForbiddenChars; if(CONTENT_TYPE_BOOKMARK == nType) { - sForbiddenChars = rtl::OUString("/\\@:*?\";,.#"); + sForbiddenChars = OUString("/\\@:*?\";,.#"); } else if(CONTENT_TYPE_TABLE == nType) { - sForbiddenChars = rtl::OUString(" .<>"); + sForbiddenChars = OUString(" .<>"); } pDlg->SetForbiddenChars(sForbiddenChars); pDlg->Execute(); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 339b7804af4a..26dd383a071e 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -57,7 +57,6 @@ #include "swabstdlg.hxx" using namespace ::com::sun::star::uno; -using ::rtl::OUString; // Context menu for GlobalTree #define CTX_INSERT_ANY_INDEX 10 @@ -714,7 +713,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF Application::SetDefDialogParent( this ); delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( - rtl::OUString("swriter"), true ); + OUString("swriter"), true ); pDocInserter->StartExecuteModal( LINK( this, SwGlobalTree, DialogClosedHdl ) ); } else if ( pFileName->Len() ) @@ -1180,7 +1179,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) SfxStringItem aURL(SID_FILE_NAME, sFileName); SfxBoolItem aReadOnly(SID_DOC_READONLY, sal_False); - SfxStringItem aTargetFrameName( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aTargetFrameName( SID_TARGETNAME, OUString("_blank") ); SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle()); pActiveShell->GetView().GetViewFrame()->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index d0cd0e0cae9a..dda31eb4b604 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -238,14 +238,14 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector<String>& rLst ) #ifdef WNT // For Windows, a special treatment is necessary because MS has // forgotten some characters in the dialog font here. - p.SearchAndReplace(rtl::OUString("%1"), rtl::OUString(",,")); - p.SearchAndReplace(rtl::OUString("%2"), rtl::OUString("''")); + p.SearchAndReplace(OUString("%1"), OUString(",,")); + p.SearchAndReplace(OUString("%2"), OUString("''")); #else const SvtSysLocale aSysLocale; const LocaleDataWrapper& rLclD = aSysLocale.GetLocaleData(); // With real operating systems it also works without special handling. - p.SearchAndReplace(rtl::OUString("%1"), rLclD.getDoubleQuotationMarkStart()); - p.SearchAndReplace(rtl::OUString("%2"), rLclD.getDoubleQuotationMarkEnd()); + p.SearchAndReplace(OUString("%1"), rLclD.getDoubleQuotationMarkStart()); + p.SearchAndReplace(OUString("%2"), rLclD.getDoubleQuotationMarkEnd()); #endif } rLst.insert(rLst.begin() + n, p); diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index 7cfc2c4b93ba..54065a3f29fe 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -114,7 +114,7 @@ void SwNavigationConfig::Commit() PutProperties(aNames, aValues); } -void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 89a53b8e0530..a82cb2355379 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -503,7 +503,7 @@ void SwNavigationPI::MakeMark() IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess(); // collect and sort navigator reminder names - ::std::vector< ::rtl::OUString > vNavMarkNames; + ::std::vector< OUString > vNavMarkNames; for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getMarksBegin(); ppMark != pMarkAccess->getMarksEnd(); ++ppMark) @@ -517,7 +517,7 @@ void SwNavigationPI::MakeMark() if(vNavMarkNames.size() == MAX_MARKS) pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx])); - rSh.SetBookmark(KeyCode(), ::rtl::OUString(), ::rtl::OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER); + rSh.SetBookmark(KeyCode(), OUString(), OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER); SwView::SetActMark( nAutoMarkIdx ); if(++nAutoMarkIdx == MAX_MARKS) @@ -1042,7 +1042,7 @@ void SwNavigationPI::UpdateListBox() if ( !pDoc->IsHelpDocument() ) { String sEntry = pDoc->GetTitle(); - sEntry += rtl::OUString(" ("); + sEntry += OUString(" ("); if (pView == pActView) { nAct = nCount; @@ -1068,7 +1068,7 @@ void SwNavigationPI::UpdateListBox() { String sEntry = aContentTree.GetHiddenWrtShell()->GetView(). GetDocShell()->GetTitle(); - sEntry += rtl::OUString(" ("); + sEntry += OUString(" ("); sEntry += aStatusArr[ST_HIDDEN - ST_STATUS_FIRST]; sEntry += ')'; aDocListBox.InsertEntry(sEntry); @@ -1185,7 +1185,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) DELETEZ( pxObjectShell); } SfxStringItem aFileItem(SID_FILE_NAME, sFileName ); - SfxStringItem aOptionsItem( SID_OPTIONS, rtl::OUString("HRC") ); + SfxStringItem aOptionsItem( SID_OPTIONS, OUString("HRC") ); SfxLinkItem aLink( SID_DONELINK, LINK( this, SwNavigationPI, DoneLink ) ); GetActiveView()->GetViewFrame()->GetDispatcher()->Execute( diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 12d869dcb254..00aa1d71e508 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -34,7 +34,7 @@ PercentField::PercentField( Window* pWin, const ResId& rResId ) : nOldSpinSize = GetSpinSize(); nRefValue = DenormalizePercent(MetricField::GetMax(FUNIT_TWIP)); nOldDigits = GetDecimalDigits(); - SetCustomUnitText(rtl::OUString('%')); + SetCustomUnitText(OUString('%')); } PercentFieldWrap::PercentFieldWrap() @@ -53,7 +53,7 @@ void PercentFieldWrap::set(MetricField *pField) nOldSpinSize = m_pField->GetSpinSize(); nRefValue = DenormalizePercent(m_pField->GetMax(FUNIT_TWIP)); nOldDigits = m_pField->GetDecimalDigits(); - m_pField->SetCustomUnitText(rtl::OUString('%')); + m_pField->SetCustomUnitText(OUString('%')); } void PercentField::SetRefValue(sal_Int64 nValue) diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 1b18b30b21ec..31979e3ddf6b 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, uno::Reference< container::XNamed > & xN, diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 4b029f2b0348..1779833bc2c8 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -779,7 +779,7 @@ bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 aURL.Complete = sCommand; uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create(::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aURL ); - uno::Reference< frame::XDispatch > xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + uno::Reference< frame::XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if( xDisp.is() ) { uno::Sequence< beans::PropertyValue > aSeq; diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index 2d426e9fe472..a0fd65d2b7c8 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -54,7 +54,6 @@ #include <unomid.h> using namespace ::com::sun::star; -using ::rtl::OUString; const sal_Char cFrameControl[] = "com.sun.star.frame.FrameControl"; const sal_Char cFactory[] = "private:factory/swriter"; @@ -94,7 +93,7 @@ void SwOneExampleFrame::CreateErrorMessage(Window* pParent) if(SwOneExampleFrame::bShowServiceNotAvailableMessage) { String sInfo(SW_RES(STR_SERVICE_UNAVAILABLE)); - sInfo += rtl::OUString(cFrameControl); + sInfo += OUString(cFrameControl); InfoBox(pParent, sInfo).Execute(); SwOneExampleFrame::bShowServiceNotAvailableMessage = false; } @@ -130,7 +129,7 @@ void SwOneExampleFrame::CreateControl() uno::Reference< beans::XPropertySet > xPrSet(xInst, uno::UNO_QUERY); uno::Any aURL; // create new doc - rtl::OUString sTempURL(cFactory); + OUString sTempURL(cFactory); if(sArgumentURL.Len()) sTempURL = sArgumentURL; aURL <<= sTempURL; @@ -181,14 +180,14 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps, //To reproduce this problem, in edit->autotext and click through //the examples and see if the preview gets a horizontal scrollbar uno::Any aFalseSet(uno::makeAny(sal_False)); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_SCROLL_BAR )), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_SCROLL_BAR )), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_SCROLL_BAR )), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_SCROLL_BAR )), aFalseSet); if (bEnableOnlineMode) { - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), uno::makeAny(sal_True)); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), uno::makeAny(sal_True)); } } @@ -234,32 +233,32 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) if( !bIsInitialized ) { - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS)), aTrueSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS)), aTrueSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES)), aTrueSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS)), aTrueSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS)), aTrueSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES)), aTrueSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER)), aFalseSet); if(0 ==(nStyleFlags&EX_SHOW_ONLINE_LAYOUT)) { uno::Any aZoom; aZoom <<= (sal_Int16)view::DocumentZoomType::PAGE_WIDTH_EXACT; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); } else { uno::Any aZoom; aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); sal_Int16 nZoomValue = 50; if(EX_SHOW_BUSINESS_CARDS == nStyleFlags) @@ -267,7 +266,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) nZoomValue = 80; } aZoom <<= nZoomValue; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); } // set onlinelayout property after setting the zoom @@ -334,7 +333,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) uno::Reference< beans::XPropertySet > xCrsrProp(_xCursor, uno::UNO_QUERY); uno::Any aPageStyle = xCrsrProp->getPropertyValue( - rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_PAGE_STYLE_NAME))); + OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_PAGE_STYLE_NAME))); OUString sPageStyle; aPageStyle >>= sPageStyle; @@ -350,17 +349,17 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) uno::Reference< style::XStyle > xPStyle; aPStyle >>= xPStyle; uno::Reference< beans::XPropertySet > xPProp(xPStyle, uno::UNO_QUERY); - uno::Any aSize = xPProp->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE))); + uno::Any aSize = xPProp->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE))); awt::Size aPSize; aSize >>= aPSize; //TODO: set page width to card width aPSize.Width = 10000; aSize.setValue(&aPSize, ::getCppuType((awt::Size*)0)); - xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)), aSize); + xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)), aSize); uno::Any aZero; aZero <<= (sal_Int32)0; - xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEFT_MARGIN)), aZero); - xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RIGHT_MARGIN)), aZero); + xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEFT_MARGIN)), aZero); + xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RIGHT_MARGIN)), aZero); } uno::Reference< awt::XWindow > xWin( _xControl, uno::UNO_QUERY ); @@ -466,7 +465,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) uno::Reference< view::XViewSettingsSupplier > xSettings(_xController, uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xViewProps = xSettings->getViewSettings(); - uno::Any aZoom = xViewProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE))); + uno::Any aZoom = xViewProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE))); sal_Int16 nZoom = 0; aZoom >>= nZoom; @@ -475,7 +474,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) { String sTemp; sTemp = OUString::number(nZoomValues[i]); - sTemp += rtl::OUString(" %"); + sTemp += OUString(" %"); aSubPop1.InsertItem( ITEM_ZOOM + i + 1, sTemp); if(nZoom == nZoomValues[i]) aSubPop1.CheckItem(ITEM_ZOOM + i + 1); @@ -499,9 +498,9 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) uno::Any aZoom; aZoom <<= nZoom; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); } else if(ITEM_UP == nId || ITEM_DOWN == nId) { diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index c785ba94f58a..6e4fbd3de59f 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -155,7 +155,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) aViewLayout.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ViewLayout" ); + aArgs[0].Name = OUString( "ViewLayout" ); aArgs[0].Value = a; execute( aArgs ); |