Skip to content

C
core
Kaydet (Commit) 6a679931 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

micro optimization

üst 9b8c0ed9
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
sfx2/source/doc/guisaveas.cxx
Dosyayı görüntüle @ 6a679931
...@@ -107,10 +107,10 @@ ...@@ -107,10 +107,10 @@
#define STATUS_SAVEAS 2 #define STATUS_SAVEAS 2
#define STATUS_SAVEAS_STANDARDNAME 3 #define STATUS_SAVEAS_STANDARDNAME 3
const ::rtl::OUString aFilterNameString = ::rtl::OUString::createFromAscii( "FilterName" ); const ::rtl::OUString aFilterNameString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
const ::rtl::OUString aFilterOptionsString = ::rtl::OUString::createFromAscii( "FilterOptions" ); const ::rtl::OUString aFilterOptionsString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions"));
const ::rtl::OUString aFilterDataString = ::rtl::OUString::createFromAscii( "FilterData" ); const ::rtl::OUString aFilterDataString(RTL_CONSTASCII_USTRINGPARAM("FilterData"));
const ::rtl::OUString aFilterFlagsString = ::rtl::OUString::createFromAscii( "FilterFlags" ); const ::rtl::OUString aFilterFlagsString(RTL_CONSTASCII_USTRINGPARAM("FilterFlags"));
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -440,19 +440,19 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps() ...@@ -440,19 +440,19 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps()
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
::rtl::OUString ModelData_Impl::GetDocServiceName() ::rtl::OUString ModelData_Impl::GetDocServiceName()
{ {
return GetModuleProps().getUnpackedValueOrDefault(::rtl::OUString::createFromAscii( "ooSetupFactoryDocumentService" ), ::rtl::OUString()); return GetModuleProps().getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDocumentService")), ::rtl::OUString());
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
void ModelData_Impl::CheckInteractionHandler() void ModelData_Impl::CheckInteractionHandler()
{ {
::comphelper::SequenceAsHashMap::const_iterator aInteractIter = ::comphelper::SequenceAsHashMap::const_iterator aInteractIter =
m_aMediaDescrHM.find( ::rtl::OUString::createFromAscii( "InteractionHandler" ) ); m_aMediaDescrHM.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) );
if ( aInteractIter == m_aMediaDescrHM.end() ) if ( aInteractIter == m_aMediaDescrHM.end() )
{ {
try { try {
m_aMediaDescrHM[ ::rtl::OUString::createFromAscii( "InteractionHandler" ) ] m_aMediaDescrHM[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ]
<<= uno::Reference< task::XInteractionHandler >( <<= uno::Reference< task::XInteractionHandler >(
m_pOwner->GetServiceFactory()->createInstance( m_pOwner->GetServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ),
...@@ -475,7 +475,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter ...@@ -475,7 +475,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter
uno::Sequence< beans::PropertyValue > aProps; uno::Sequence< beans::PropertyValue > aProps;
::rtl::OUString aFilterName = GetModuleProps().getUnpackedValueOrDefault( ::rtl::OUString aFilterName = GetModuleProps().getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "ooSetupFactoryDefaultFilter" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDefaultFilter")),
::rtl::OUString() ); ::rtl::OUString() );
m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aProps; m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aProps;
...@@ -492,7 +492,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter ...@@ -492,7 +492,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter
if ( aProps.getLength() ) if ( aProps.getLength() )
{ {
::comphelper::SequenceAsHashMap aFiltHM( aProps ); ::comphelper::SequenceAsHashMap aFiltHM( aProps );
sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),
(sal_Int32)0 ); (sal_Int32)0 );
if ( ( ( nFlags & nMust ) == nMust ) && !( nFlags & nDont ) ) if ( ( ( nFlags & nMust ) == nMust ) && !( nFlags & nDont ) )
aFilterProps = aProps; aFilterProps = aProps;
...@@ -506,7 +506,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter ...@@ -506,7 +506,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter
uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ) uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont )
{ {
uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "DocumentService" ); aSearchRequest[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService"));
aSearchRequest[0].Value <<= GetDocServiceName(); aSearchRequest[0].Value <<= GetDocServiceName();
return SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); return SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
...@@ -524,9 +524,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( ...@@ -524,9 +524,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl(
{ {
// Preselect PDF-Filter for EXPORT // Preselect PDF-Filter for EXPORT
uno::Sequence< beans::NamedValue > aSearchRequest( 2 ); uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "Type" ); aSearchRequest[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type"));
aSearchRequest[0].Value <<= ::rtl::OUString::createFromAscii( "pdf_Portable_Document_Format" ); aSearchRequest[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format"));
aSearchRequest[1].Name = ::rtl::OUString::createFromAscii( "DocumentService" ); aSearchRequest[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService"));
aSearchRequest[1].Value <<= GetDocServiceName(); aSearchRequest[1].Value <<= GetDocServiceName();
aFilterProps = SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); aFilterProps = SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
...@@ -557,7 +557,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte ...@@ -557,7 +557,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte
{ {
sal_Int32 nPropertyCount = aProps.getLength(); sal_Int32 nPropertyCount = aProps.getLength();
for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty ) for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty )
if( aProps[nProperty].Name.equals( ::rtl::OUString::createFromAscii("UIComponent")) ) if( aProps[nProperty].Name.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
{ {
::rtl::OUString aServiceName; ::rtl::OUString aServiceName;
aProps[nProperty].Value >>= aServiceName; aProps[nProperty].Value >>= aServiceName;
...@@ -641,7 +641,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) ...@@ -641,7 +641,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus )
// the saving is acceptable // the saving is acceptable
// in case the configuration entry is not set or set to false // in case the configuration entry is not set or set to false
// or in case of version creation // or in case of version creation
::rtl::OUString aVersionCommentString = ::rtl::OUString::createFromAscii( "VersionComment" ); ::rtl::OUString aVersionCommentString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VersionComment"));
if ( ( ::comphelper::ConfigurationHelper::readRelativeKey( if ( ( ::comphelper::ConfigurationHelper::readRelativeKey(
xCommonConfig, xCommonConfig,
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Save/Document/" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Save/Document/" ) ),
...@@ -675,10 +675,10 @@ sal_Int8 ModelData_Impl::CheckStateForSave() ...@@ -675,10 +675,10 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
sal_Bool bVersInfoNeedsStore = sal_False; sal_Bool bVersInfoNeedsStore = sal_False;
::comphelper::SequenceAsHashMap aAcceptedArgs; ::comphelper::SequenceAsHashMap aAcceptedArgs;
::rtl::OUString aVersionCommentString = ::rtl::OUString::createFromAscii( "VersionComment" ); ::rtl::OUString aVersionCommentString(RTL_CONSTASCII_USTRINGPARAM("VersionComment"));
::rtl::OUString aAuthorString = ::rtl::OUString::createFromAscii( "Author" ); ::rtl::OUString aAuthorString(RTL_CONSTASCII_USTRINGPARAM("Author"));
::rtl::OUString aInteractionHandlerString = ::rtl::OUString::createFromAscii( "InteractionHandler" ); ::rtl::OUString aInteractionHandlerString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler"));
::rtl::OUString aStatusIndicatorString = ::rtl::OUString::createFromAscii( "StatusIndicator" ); ::rtl::OUString aStatusIndicatorString(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator"));
if ( GetMediaDescr().find( aVersionCommentString ) != GetMediaDescr().end() ) if ( GetMediaDescr().find( aVersionCommentString ) != GetMediaDescr().end() )
{ {
...@@ -732,13 +732,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) ...@@ -732,13 +732,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName )
m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), (sal_Int32)0 ); nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
} }
// only a temporary solution until default filter retrieving feature is implemented // only a temporary solution until default filter retrieving feature is implemented
// then GetDocServiceDefaultFilter() must be used // then GetDocServiceDefaultFilter() must be used
::comphelper::SequenceAsHashMap aDefFiltPropsHM = GetDocServiceDefaultFilterCheckFlags( 3, 0 ); ::comphelper::SequenceAsHashMap aDefFiltPropsHM = GetDocServiceDefaultFilterCheckFlags( 3, 0 );
sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), (sal_Int32)0 ); sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
// if the old filter is not acceptable // if the old filter is not acceptable
// and there is no default filter or it is not acceptable for requested parameters then proceed with saveAs // and there is no default filter or it is not acceptable for requested parameters then proceed with saveAs
...@@ -758,12 +758,12 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) ...@@ -758,12 +758,12 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName )
{ {
// the default filter is acceptable and the old filter is alian one // the default filter is acceptable and the old filter is alian one
// so ask to make a saveAs operation // so ask to make a saveAs operation
::rtl::OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "UIName" ), ::rtl::OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")),
::rtl::OUString() ); ::rtl::OUString() );
::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "UIName" ), ::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")),
::rtl::OUString() ); ::rtl::OUString() );
::rtl::OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "PreusedFilterName" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreusedFilterName")),
::rtl::OUString() ); ::rtl::OUString() );
if ( !aPreusedFilterName.equals( aFilterName ) && !aUIName.equals( aDefUIName ) ) if ( !aPreusedFilterName.equals( aFilterName ) && !aUIName.equals( aDefUIName ) )
{ {
...@@ -779,7 +779,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) ...@@ -779,7 +779,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName )
sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence()
{ {
uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "DocumentService" ); aSearchRequest[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService"));
aSearchRequest[0].Value <<= GetDocServiceName(); aSearchRequest[0].Value <<= GetDocServiceName();
uno::Reference< container::XEnumeration > xFilterEnum = uno::Reference< container::XEnumeration > xFilterEnum =
...@@ -792,7 +792,7 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() ...@@ -792,7 +792,7 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence()
{ {
::comphelper::SequenceAsHashMap aPropsHM( pProps ); ::comphelper::SequenceAsHashMap aPropsHM( pProps );
::rtl::OUString aUIServName = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString aUIServName = aPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "UIComponent" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent")),
::rtl::OUString() ); ::rtl::OUString() );
if ( aUIServName.getLength() ) if ( aUIServName.getLength() )
return sal_True; return sal_True;
...@@ -816,7 +816,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, ...@@ -816,7 +816,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
sal_Bool bUseFilterOptions = sal_False; sal_Bool bUseFilterOptions = sal_False;
::comphelper::SequenceAsHashMap::const_iterator aOverwriteIter = ::comphelper::SequenceAsHashMap::const_iterator aOverwriteIter =
GetMediaDescr().find( ::rtl::OUString::createFromAscii( "Overwrite" ) ); GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Overwrite")) );
// the file name must be specified if overwrite option is set // the file name must be specified if overwrite option is set
if ( aOverwriteIter != GetMediaDescr().end() ) if ( aOverwriteIter != GetMediaDescr().end() )
...@@ -870,7 +870,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, ...@@ -870,7 +870,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
// this is a PDF export // this is a PDF export
// the filter options has been shown already // the filter options has been shown already
::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "UIName" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")),
::rtl::OUString() ); ::rtl::OUString() );
pFileDlg = new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf" ) ), rStandardDir, rBlackList ); pFileDlg = new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf" ) ), rStandardDir, rBlackList );
...@@ -920,7 +920,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, ...@@ -920,7 +920,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
{ {
// it is export, set the preselected filter // it is export, set the preselected filter
::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "UIName" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")),
::rtl::OUString() ); ::rtl::OUString() );
pFileDlg->SetCurrentFilter( aFilterUIName ); pFileDlg->SetCurrentFilter( aFilterUIName );
} }
...@@ -936,24 +936,24 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, ...@@ -936,24 +936,24 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
m_pOwner->GetFilterConfiguration()->getByName( aOldFilterName ) >>= aOldFilterProps; m_pOwner->GetFilterConfiguration()->getByName( aOldFilterName ) >>= aOldFilterProps;
::comphelper::SequenceAsHashMap aOldFiltPropsHM( aOldFilterProps ); ::comphelper::SequenceAsHashMap aOldFiltPropsHM( aOldFilterProps );
sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), (sal_Int32)0 ); sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
if ( bSetStandardName || ( nOldFiltFlags & nMust ) != nMust || nOldFiltFlags & nDont ) if ( bSetStandardName || ( nOldFiltFlags & nMust ) != nMust || nOldFiltFlags & nDont )
{ {
// the suggested type will be changed, the extension should be adjusted // the suggested type will be changed, the extension should be adjusted
aAdjustToType = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( aAdjustToType = aPreselectedFilterPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "Type" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")),
::rtl::OUString() ); ::rtl::OUString() );
::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "UIName" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")),
::rtl::OUString() ); ::rtl::OUString() );
pFileDlg->SetCurrentFilter( aFilterUIName ); pFileDlg->SetCurrentFilter( aFilterUIName );
} }
else else
{ {
pFileDlg->SetCurrentFilter( aOldFiltPropsHM.getUnpackedValueOrDefault( pFileDlg->SetCurrentFilter( aOldFiltPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "UIName" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")),
::rtl::OUString() ) ); ::rtl::OUString() ) );
} }
} }
...@@ -967,7 +967,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, ...@@ -967,7 +967,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
uno::Reference < view::XSelectionSupplier > xSel( GetModel()->getCurrentController(), uno::UNO_QUERY ); uno::Reference < view::XSelectionSupplier > xSel( GetModel()->getCurrentController(), uno::UNO_QUERY );
if ( xSel.is() && xSel->getSelection().hasValue() ) if ( xSel.is() && xSel->getSelection().hasValue() )
GetMediaDescr()[::rtl::OUString::createFromAscii( "SelectionOnly" )] <<= sal_True; GetMediaDescr()[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionOnly"))] <<= sal_True;
// This is a temporary hardcoded solution must be removed when // This is a temporary hardcoded solution must be removed when
// dialogs do not need parameters in SidSet representation any more // dialogs do not need parameters in SidSet representation any more
...@@ -1095,7 +1095,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, ...@@ -1095,7 +1095,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
delete pFileDlg; delete pFileDlg;
// merge in results of the dialog execution // merge in results of the dialog execution
GetMediaDescr()[::rtl::OUString::createFromAscii( "URL" )] <<= GetMediaDescr()[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))] <<=
::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE )); ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ));
GetMediaDescr()[aFilterNameString] <<= aFilterName; GetMediaDescr()[aFilterNameString] <<= aFilterName;
...@@ -1115,7 +1115,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() ...@@ -1115,7 +1115,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
if ( xFrameDispatch.is() ) if ( xFrameDispatch.is() )
{ {
util::URL aURL; util::URL aURL;
aURL.Complete = ::rtl::OUString::createFromAscii( ".uno:SetDocumentProperties" ); aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SetDocumentProperties"));
uno::Reference< util::XURLTransformer > xTransformer( uno::Reference< util::XURLTransformer > xTransformer(
m_pOwner->GetServiceFactory()->createInstance( m_pOwner->GetServiceFactory()->createInstance(
...@@ -1125,7 +1125,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() ...@@ -1125,7 +1125,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
{ {
uno::Reference< frame::XDispatch > xDispatch = xFrameDispatch->queryDispatch( uno::Reference< frame::XDispatch > xDispatch = xFrameDispatch->queryDispatch(
aURL, aURL,
::rtl::OUString::createFromAscii( "_self" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
0 ); 0 );
if ( xDispatch.is() ) if ( xDispatch.is() )
{ {
...@@ -1149,7 +1149,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() ...@@ -1149,7 +1149,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
::rtl::OUString aReccomendedDir; ::rtl::OUString aReccomendedDir;
if ( ( aSuggestedDir.getLength() || GetStorable()->hasLocation() ) if ( ( aSuggestedDir.getLength() || GetStorable()->hasLocation() )
&& !GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "RepairPackage" ), && !GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")),
sal_False ) ) sal_False ) )
{ {
INetURLObject aLocation; INetURLObject aLocation;
...@@ -1206,7 +1206,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() ...@@ -1206,7 +1206,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
{ {
// adjust the extension to the type // adjust the extension to the type
uno::Reference< container::XNameAccess > xTypeDetection = uno::Reference< container::XNameAccess >( uno::Reference< container::XNameAccess > xTypeDetection = uno::Reference< container::XNameAccess >(
m_pOwner->GetServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ), m_pOwner->GetServiceFactory()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
if ( xTypeDetection.is() ) if ( xTypeDetection.is() )
{ {
...@@ -1217,7 +1217,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() ...@@ -1217,7 +1217,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
{ {
::comphelper::SequenceAsHashMap aTypeNamePropsHM( aTypeNameProps ); ::comphelper::SequenceAsHashMap aTypeNamePropsHM( aTypeNameProps );
uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "Extensions" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions")),
::uno::Sequence< ::rtl::OUString >() ); ::uno::Sequence< ::rtl::OUString >() );
if ( aExtensions.getLength() ) if ( aExtensions.getLength() )
aObj.SetExtension( aExtensions[0] ); aObj.SetExtension( aExtensions[0] );
...@@ -1260,7 +1260,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio ...@@ -1260,7 +1260,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio
if ( !m_xFilterCFG.is() ) if ( !m_xFilterCFG.is() )
{ {
m_xFilterCFG = uno::Reference< container::XNameAccess >( m_xFilterCFG = uno::Reference< container::XNameAccess >(
GetServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ), GetServiceFactory()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
if ( !m_xFilterCFG.is() ) if ( !m_xFilterCFG.is() )
...@@ -1290,7 +1290,7 @@ uno::Reference< ::com::sun::star::frame::XModuleManager > SfxStoringHelper::GetM ...@@ -1290,7 +1290,7 @@ uno::Reference< ::com::sun::star::frame::XModuleManager > SfxStoringHelper::GetM
{ {
m_xModuleManager = uno::Reference< ::com::sun::star::frame::XModuleManager >( m_xModuleManager = uno::Reference< ::com::sun::star::frame::XModuleManager >(
GetServiceFactory()->createInstance( GetServiceFactory()->createInstance(
::rtl::OUString::createFromAscii( "com.sun.star.frame.ModuleManager" ) ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
if ( !m_xModuleManager.is() ) if ( !m_xModuleManager.is() )
...@@ -1337,7 +1337,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& ...@@ -1337,7 +1337,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
if ( nStoreMode & SAVEAS_REQUESTED ) if ( nStoreMode & SAVEAS_REQUESTED )
{ {
::comphelper::SequenceAsHashMap::const_iterator aSaveToIter = ::comphelper::SequenceAsHashMap::const_iterator aSaveToIter =
aModelData.GetMediaDescr().find( ::rtl::OUString::createFromAscii( "SaveTo" ) ); aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveTo")) );
if ( aSaveToIter != aModelData.GetMediaDescr().end() ) if ( aSaveToIter != aModelData.GetMediaDescr().end() )
{ {
sal_Bool bWideExport = sal_False; sal_Bool bWideExport = sal_False;
...@@ -1431,7 +1431,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& ...@@ -1431,7 +1431,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
::comphelper::SequenceAsHashMap aFilterPropsHM( aFilterProps ); ::comphelper::SequenceAsHashMap aFilterPropsHM( aFilterProps );
::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "Name" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
::rtl::OUString() ); ::rtl::OUString() );
::rtl::OUString aFilterFromMediaDescr = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString aFilterFromMediaDescr = aModelData.GetMediaDescr().getUnpackedValueOrDefault(
...@@ -1442,7 +1442,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& ...@@ -1442,7 +1442,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
::rtl::OUString() ); ::rtl::OUString() );
sal_Bool bUseFilterOptions = sal_False; sal_Bool bUseFilterOptions = sal_False;
::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString::createFromAscii( "URL" ) ); ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) );
if ( ( nStoreMode & EXPORT_REQUESTED ) && ( nStoreMode & PDFEXPORT_REQUESTED ) && !( nStoreMode & PDFDIRECTEXPORT_REQUESTED ) ) if ( ( nStoreMode & EXPORT_REQUESTED ) && ( nStoreMode & PDFEXPORT_REQUESTED ) && !( nStoreMode & PDFDIRECTEXPORT_REQUESTED ) )
{ {
...@@ -1462,7 +1462,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& ...@@ -1462,7 +1462,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
{ {
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG; sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG;
::comphelper::SequenceAsHashMap::const_iterator aDlgIter = ::comphelper::SequenceAsHashMap::const_iterator aDlgIter =
aModelData.GetMediaDescr().find( ::rtl::OUString::createFromAscii( "UseSystemDialog" ) ); aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSystemDialog")) );
if ( aDlgIter != aModelData.GetMediaDescr().end() ) if ( aDlgIter != aModelData.GetMediaDescr().end() )
{ {
sal_Bool bUseSystemDialog = sal_True; sal_Bool bUseSystemDialog = sal_True;
...@@ -1490,14 +1490,14 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& ...@@ -1490,14 +1490,14 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
::rtl::OUString sStandardDir; ::rtl::OUString sStandardDir;
::comphelper::SequenceAsHashMap::const_iterator aStdDirIter = ::comphelper::SequenceAsHashMap::const_iterator aStdDirIter =
aModelData.GetMediaDescr().find( ::rtl::OUString::createFromAscii( "StandardDir" ) ); aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StandardDir")) );
if ( aStdDirIter != aModelData.GetMediaDescr().end() ) if ( aStdDirIter != aModelData.GetMediaDescr().end() )
aStdDirIter->second >>= sStandardDir; aStdDirIter->second >>= sStandardDir;
::com::sun::star::uno::Sequence< ::rtl::OUString > aBlackList; ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlackList;
::comphelper::SequenceAsHashMap::const_iterator aBlackListIter = ::comphelper::SequenceAsHashMap::const_iterator aBlackListIter =
aModelData.GetMediaDescr().find( ::rtl::OUString::createFromAscii( "BlackList" ) ); aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BlackList")) );
if ( aBlackListIter != aModelData.GetMediaDescr().end() ) if ( aBlackListIter != aModelData.GetMediaDescr().end() )
aBlackListIter->second >>= aBlackList; aBlackListIter->second >>= aBlackList;
...@@ -1531,7 +1531,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& ...@@ -1531,7 +1531,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
} }
bDialogUsed = sal_True; bDialogUsed = sal_True;
aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString::createFromAscii( "URL" ) ); aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) );
} }
else else
{ {
...@@ -1578,7 +1578,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& ...@@ -1578,7 +1578,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
} }
::comphelper::SequenceAsHashMap::const_iterator aIter = ::comphelper::SequenceAsHashMap::const_iterator aIter =
aModelData.GetMediaDescr().find( ::rtl::OUString::createFromAscii( "FilterFlags" ) ); aModelData.GetMediaDescr().find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterFlags")) );
sal_Bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() ); sal_Bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() );
if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !bFilterFlagsSet if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !bFilterFlagsSet
...@@ -1677,7 +1677,7 @@ uno::Sequence< beans::PropertyValue > SfxStoringHelper::SearchForFilter( ...@@ -1677,7 +1677,7 @@ uno::Sequence< beans::PropertyValue > SfxStoringHelper::SearchForFilter(
if ( xFilterEnum->nextElement() >>= aProps ) if ( xFilterEnum->nextElement() >>= aProps )
{ {
::comphelper::SequenceAsHashMap aPropsHM( aProps ); ::comphelper::SequenceAsHashMap aPropsHM( aProps );
sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),
(sal_Int32)0 ); (sal_Int32)0 );
if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) ) if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
{ {
...@@ -1714,7 +1714,7 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( ...@@ -1714,7 +1714,7 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence(
{ {
::comphelper::SequenceAsHashMap aPropsHM( aProps ); ::comphelper::SequenceAsHashMap aPropsHM( aProps );
::rtl::OUString aServiceName = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString aServiceName = aPropsHM.getUnpackedValueOrDefault(
::rtl::OUString::createFromAscii( "UIComponent" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent")),
::rtl::OUString() ); ::rtl::OUString() );
if( aServiceName.getLength() ) if( aServiceName.getLength() )
bUseFilterOptions = sal_True; bUseFilterOptions = sal_True;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment