Skip to content

C
core
Kaydet (Commit) 554a45f2 authored tarafından Ricardo Montania's avatar Ricardo Montania Kaydeden (comit) Olivier Hallot
Dosyalara gözat
Seçenekler

::rtl::OUString to OUString in basctl 

Change-Id: I34228049e15ee8a899a4c5e1484d7ed3bc541dd4
Reviewed-on: https://gerrit.libreoffice.org/748Reviewed-by: 's avatarOlivier Hallot <olivier.hallot@alta.org.br>
Tested-by: 's avatarOlivier Hallot <olivier.hallot@alta.org.br>
üst a51833bf
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 112 deletions
basctl/source/basicide/baside3.cxx
Dosyayı görüntüle @ 554a45f2
...@@ -77,7 +77,7 @@ TYPEINIT1( DialogWindow, BaseWindow ); ...@@ -77,7 +77,7 @@ TYPEINIT1( DialogWindow, BaseWindow );
DialogWindow::DialogWindow ( DialogWindow::DialogWindow (
DialogWindowLayout* pParent, DialogWindowLayout* pParent,
ScriptDocument const& rDocument, ScriptDocument const& rDocument,
rtl::OUString aLibName, rtl::OUString aName, OUString aLibName, OUString aName,
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel
) : ) :
BaseWindow(pParent, rDocument, aLibName, aName), BaseWindow(pParent, rDocument, aLibName, aName),
...@@ -256,7 +256,7 @@ void DialogWindow::GetState( SfxItemSet& rSet ) ...@@ -256,7 +256,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
if ( xModel.is() ) if ( xModel.is() )
{ {
Reference< lang::XServiceInfo > xServiceInfo ( xModel, UNO_QUERY ); Reference< lang::XServiceInfo > xServiceInfo ( xModel, UNO_QUERY );
if ( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ) ) ) if ( xServiceInfo.is() && xServiceInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
bIsCalc = true; bIsCalc = true;
} }
} }
...@@ -662,7 +662,7 @@ Reference< container::XNameContainer > DialogWindow::GetDialog() const ...@@ -662,7 +662,7 @@ Reference< container::XNameContainer > DialogWindow::GetDialog() const
return pEditor->GetDialog(); return pEditor->GetDialog();
} }
bool DialogWindow::RenameDialog( const ::rtl::OUString& rNewName ) bool DialogWindow::RenameDialog( const OUString& rNewName )
{ {
if ( !basctl::RenameDialog( this, GetDocument(), GetLibName(), GetName(), rNewName ) ) if ( !basctl::RenameDialog( this, GetDocument(), GetLibName(), GetName(), rNewName ) )
return false; return false;
...@@ -683,7 +683,7 @@ void DialogWindow::UpdateBrowser() ...@@ -683,7 +683,7 @@ void DialogWindow::UpdateBrowser()
rLayout.UpdatePropertyBrowser(); rLayout.UpdatePropertyBrowser();
} }
static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" )); static OUString aResourceResolverPropName( "ResourceResolver" );
bool DialogWindow::SaveDialog() bool DialogWindow::SaveDialog()
{ {
...@@ -697,7 +697,7 @@ bool DialogWindow::SaveDialog() ...@@ -697,7 +697,7 @@ bool DialogWindow::SaveDialog()
Sequence <Any> aServiceType(1); Sequence <Any> aServiceType(1);
aServiceType[0] <<= TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD; aServiceType[0] <<= TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD;
xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY );
} }
Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY);
...@@ -709,17 +709,17 @@ bool DialogWindow::SaveDialog() ...@@ -709,17 +709,17 @@ bool DialogWindow::SaveDialog()
if ( !aCurPath.isEmpty() ) if ( !aCurPath.isEmpty() )
xFP->setDisplayDirectory ( aCurPath ); xFP->setDisplayDirectory ( aCurPath );
xFP->setDefaultName( ::rtl::OUString( GetName() ) ); xFP->setDefaultName( OUString( GetName() ) );
::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); xFltMgr->appendFilter( aDialogStr, String( "*.xdl" ) );
xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) );
xFltMgr->setCurrentFilter( aDialogStr ); xFltMgr->setCurrentFilter( aDialogStr );
if( xFP->execute() == RET_OK ) if( xFP->execute() == RET_OK )
{ {
Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); Sequence< OUString > aPaths = xFP->getFiles();
aCurPath = aPaths[0]; aCurPath = aPaths[0];
// export dialog model to xml // export dialog model to xml
...@@ -782,29 +782,29 @@ bool DialogWindow::SaveDialog() ...@@ -782,29 +782,29 @@ bool DialogWindow::SaveDialog()
{ {
INetURLObject aURLObj( aCurPath ); INetURLObject aURLObj( aCurPath );
aURLObj.removeExtension(); aURLObj.removeExtension();
::rtl::OUString aDialogName( aURLObj.getName() ); OUString aDialogName( aURLObj.getName() );
aURLObj.removeSegment(); aURLObj.removeSegment();
::rtl::OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
bool bReadOnly = false; bool bReadOnly = false;
::rtl::OUString aComment( RTL_CONSTASCII_USTRINGPARAM( "# " )); OUString aComment( "# " );
aComment += aDialogName; aComment += aDialogName;
aComment += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " strings" )); aComment += " strings" ;
Reference< task::XInteractionHandler > xDummyHandler; Reference< task::XInteractionHandler > xDummyHandler;
// Remove old properties files in case of overwriting Dialog files // Remove old properties files in case of overwriting Dialog files
if( xSFI->isFolder( aURL ) ) if( xSFI->isFolder( aURL ) )
{ {
Sequence< ::rtl::OUString > aContentSeq = xSFI->getFolderContents( aURL, false ); Sequence< OUString > aContentSeq = xSFI->getFolderContents( aURL, false );
::rtl::OUString aDialogName_( aDialogName ); OUString aDialogName_( aDialogName );
aDialogName_ += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_" )); aDialogName_ += "_" ;
sal_Int32 nCount = aContentSeq.getLength(); sal_Int32 nCount = aContentSeq.getLength();
const ::rtl::OUString* pFiles = aContentSeq.getConstArray(); const OUString* pFiles = aContentSeq.getConstArray();
for( int i = 0 ; i < nCount ; i++ ) for( int i = 0 ; i < nCount ; i++ )
{ {
::rtl::OUString aCompleteName = pFiles[i]; OUString aCompleteName = pFiles[i];
rtl::OUString aPureName; OUString aPureName;
rtl::OUString aExtension; OUString aExtension;
sal_Int32 iDot = aCompleteName.lastIndexOf( '.' ); sal_Int32 iDot = aCompleteName.lastIndexOf( '.' );
sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' ); sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' );
if( iDot != -1 ) if( iDot != -1 )
...@@ -946,7 +946,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, ...@@ -946,7 +946,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent,
} }
bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName ) bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName )
{ {
bool bDone = false; bool bDone = false;
...@@ -957,7 +957,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -957,7 +957,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
Sequence <Any> aServiceType(1); Sequence <Any> aServiceType(1);
aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE; aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE;
xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY ); "com.sun.star.ui.dialogs.FilePicker", aServiceType ), UNO_QUERY );
} }
Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY);
...@@ -966,23 +966,23 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -966,23 +966,23 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
aValue <<= sal_True; aValue <<= sal_True;
xFPControl->setValue(ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue); xFPControl->setValue(ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue);
::rtl::OUString aCurPath( rCurPath ); OUString aCurPath( rCurPath );
if ( !aCurPath.isEmpty() ) if ( !aCurPath.isEmpty() )
xFP->setDisplayDirectory ( aCurPath ); xFP->setDisplayDirectory ( aCurPath );
::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME)); OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY); Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) ); xFltMgr->appendFilter( aDialogStr, String( "*.xdl" ) );
xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) ); xFltMgr->appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( FilterMask_All ) );
xFltMgr->setCurrentFilter( aDialogStr ); xFltMgr->setCurrentFilter( aDialogStr );
if( xFP->execute() == RET_OK ) if( xFP->execute() == RET_OK )
{ {
Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); Sequence< OUString > aPaths = xFP->getFiles();
aCurPath = aPaths[0]; aCurPath = aPaths[0];
::rtl::OUString aBasePath; OUString aBasePath;
::rtl::OUString aOUCurPath( aCurPath ); OUString aOUCurPath( aCurPath );
sal_Int32 iSlash = aOUCurPath.lastIndexOf( '/' ); sal_Int32 iSlash = aOUCurPath.lastIndexOf( '/' );
if( iSlash != -1 ) if( iSlash != -1 )
aBasePath = aOUCurPath.copy( 0, iSlash + 1 ); aBasePath = aOUCurPath.copy( 0, iSlash + 1 );
...@@ -991,7 +991,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -991,7 +991,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
{ {
// create dialog model // create dialog model
Reference< container::XNameContainer > xDialogModel( xMSF->createInstance Reference< container::XNameContainer > xDialogModel( xMSF->createInstance
( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY_THROW ); ( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW );
Reference< XSimpleFileAccess2 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) ); Reference< XSimpleFileAccess2 > xSFI( SimpleFileAccess::create(comphelper::getProcessComponentContext()) );
...@@ -1003,14 +1003,14 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -1003,14 +1003,14 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
comphelper::getComponentContext( xMSF ) ); comphelper::getComponentContext( xMSF ) );
::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() ); ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
::rtl::OUString aXmlDlgName; OUString aXmlDlgName;
Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY ); Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY );
if( xDialogModelPropSet.is() ) if( xDialogModelPropSet.is() )
{ {
try try
{ {
Any aXmlDialogNameAny = xDialogModelPropSet->getPropertyValue( DLGED_PROP_NAME ); Any aXmlDialogNameAny = xDialogModelPropSet->getPropertyValue( DLGED_PROP_NAME );
::rtl::OUString aOUXmlDialogName; OUString aOUXmlDialogName;
aXmlDialogNameAny >>= aOUXmlDialogName; aXmlDialogNameAny >>= aOUXmlDialogName;
aXmlDlgName = aOUXmlDialogName; aXmlDlgName = aOUXmlDialogName;
} }
...@@ -1024,7 +1024,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -1024,7 +1024,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
bool bDialogAlreadyExists = rDocument.hasDialog( aLibName, aXmlDlgName ); bool bDialogAlreadyExists = rDocument.hasDialog( aLibName, aXmlDlgName );
::rtl::OUString aNewDlgName = aXmlDlgName; OUString aNewDlgName = aXmlDlgName;
enum NameClashMode enum NameClashMode
{ {
NO_CLASH, NO_CLASH,
...@@ -1034,8 +1034,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -1034,8 +1034,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
NameClashMode eNameClashMode = NO_CLASH; NameClashMode eNameClashMode = NO_CLASH;
if( bDialogAlreadyExists ) if( bDialogAlreadyExists )
{ {
::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE)); OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TITLE));
::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT)); OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_CLASH_TEXT));
aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName); aQueryBoxText = aQueryBoxText.replaceAll("$(ARG1)", aXmlDlgName);
NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
...@@ -1071,7 +1071,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -1071,7 +1071,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
bool bReadOnly = true; bool bReadOnly = true;
Reference< XStringResourceWithLocation > xImportStringResource = Reference< XStringResourceWithLocation > xImportStringResource =
StringResourceWithLocation::create( xContext, aBasePath, bReadOnly, StringResourceWithLocation::create( xContext, aBasePath, bReadOnly,
aLocale, aXmlDlgName, ::rtl::OUString(), xDummyHandler ); aLocale, aXmlDlgName, OUString(), xDummyHandler );
Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales(); Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales();
sal_Int32 nImportLocaleCount = aImportLocaleSeq.getLength(); sal_Int32 nImportLocaleCount = aImportLocaleSeq.getLength();
...@@ -1098,8 +1098,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -1098,8 +1098,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
bool bAddDialogLanguagesToLib = false; bool bAddDialogLanguagesToLib = false;
if( nOnlyInImportLanguageCount > 0 ) if( nOnlyInImportLanguageCount > 0 )
{ {
::rtl::OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE)); OUString aQueryBoxTitle(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TITLE));
::rtl::OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT)); OUString aQueryBoxText(IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_TEXT));
LanguageMismatchQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); LanguageMismatchQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
sal_uInt16 nRet = aQueryBox.Execute(); sal_uInt16 nRet = aQueryBox.Execute();
if( RET_YES == nRet ) if( RET_YES == nRet )
...@@ -1207,7 +1207,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri ...@@ -1207,7 +1207,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
try try
{ {
Any aXmlDialogNameAny; Any aXmlDialogNameAny;
aXmlDialogNameAny <<= ::rtl::OUString( aNewDlgName ); aXmlDialogNameAny <<= OUString( aNewDlgName );
xDialogModelPropSet->setPropertyValue( DLGED_PROP_NAME, aXmlDialogNameAny ); xDialogModelPropSet->setPropertyValue( DLGED_PROP_NAME, aXmlDialogNameAny );
bRenamed = true; bRenamed = true;
} }
...@@ -1250,7 +1250,7 @@ bool DialogWindow::ImportDialog() ...@@ -1250,7 +1250,7 @@ bool DialogWindow::ImportDialog()
DBG_CHKTHIS( DialogWindow, 0 ); DBG_CHKTHIS( DialogWindow, 0 );
const ScriptDocument& rDocument = GetDocument(); const ScriptDocument& rDocument = GetDocument();
::rtl::OUString aLibName = GetLibName(); OUString aLibName = GetLibName();
return implImportDialog( this, aCurPath, rDocument, aLibName ); return implImportDialog( this, aCurPath, rDocument, aLibName );
} }
...@@ -1279,7 +1279,7 @@ bool DialogWindow::IsModified() ...@@ -1279,7 +1279,7 @@ bool DialogWindow::IsModified()
return pUndoMgr.get(); return pUndoMgr.get();
} }
::rtl::OUString DialogWindow::GetTitle() OUString DialogWindow::GetTitle()
{ {
return GetName(); return GetName();
} }
...@@ -1287,8 +1287,8 @@ bool DialogWindow::IsModified() ...@@ -1287,8 +1287,8 @@ bool DialogWindow::IsModified()
EntryDescriptor DialogWindow::CreateEntryDescriptor() EntryDescriptor DialogWindow::CreateEntryDescriptor()
{ {
ScriptDocument aDocument( GetDocument() ); ScriptDocument aDocument( GetDocument() );
::rtl::OUString aLibName( GetLibName() ); OUString aLibName( GetLibName() );
::rtl::OUString aLibSubName; OUString aLibSubName;
LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName ); LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
return EntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG ); return EntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG );
} }
...@@ -1325,7 +1325,7 @@ void DialogWindow::StoreData() ...@@ -1325,7 +1325,7 @@ void DialogWindow::StoreData()
Reference< XComponentContext > xContext( Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() ); comphelper::getProcessComponentContext() );
Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() ); Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) ); xLib->replaceByName( OUString( GetName() ), makeAny( xISP ) );
} }
} }
} }
......
basctl/source/basicide/basidectrlr.cxx
Dosyayı görüntüle @ 554a45f2
...@@ -38,7 +38,7 @@ namespace ...@@ -38,7 +38,7 @@ namespace
{ {
int const nPropertyIconId = 1; int const nPropertyIconId = 1;
rtl::OUString const sPropertyIconId("IconId"); OUString const sPropertyIconId("IconId");
} }
......
basctl/source/basicide/basides1.cxx
Dosyayı görüntüle @ 554a45f2
...@@ -114,8 +114,8 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) ...@@ -114,8 +114,8 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
else else
nFound = pCurWin->StartSearchAndReplace(rSearchItem); nFound = pCurWin->StartSearchAndReplace(rSearchItem);
rtl::OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES)); OUString aReplStr(IDE_RESSTR(RID_STR_SEARCHREPLACES));
aReplStr = aReplStr.replaceAll("XX", rtl::OUString::valueOf(nFound)); aReplStr = aReplStr.replaceAll("XX", OUString::valueOf(nFound));
InfoBox( pCurWin, aReplStr ).Execute(); InfoBox( pCurWin, aReplStr ).Execute();
} }
else else
...@@ -272,7 +272,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -272,7 +272,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
break; break;
case SID_BASICIDE_CHOOSEMACRO: case SID_BASICIDE_CHOOSEMACRO:
{ {
ChooseMacro( NULL, false, ::rtl::OUString() ); ChooseMacro( NULL, false, OUString() );
} }
break; break;
case SID_BASICIDE_CREATEMACRO: case SID_BASICIDE_CREATEMACRO:
...@@ -286,9 +286,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -286,9 +286,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
StartListening( *pBasMgr, true /* log on only once */ ); StartListening( *pBasMgr, true /* log on only once */ );
::rtl::OUString aLibName( rInfo.GetLib() ); OUString aLibName( rInfo.GetLib() );
if ( aLibName.isEmpty() ) if ( aLibName.isEmpty() )
aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); aLibName = "Standard" ;
StarBASIC* pBasic = pBasMgr->GetLib( aLibName ); StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
if ( !pBasic ) if ( !pBasic )
{ {
...@@ -310,9 +310,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -310,9 +310,9 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
{ {
if ( rInfo.GetModule().Len() || !pBasic->GetModules()->Count() ) if ( rInfo.GetModule().Len() || !pBasic->GetModules()->Count() )
{ {
::rtl::OUString aModName = rInfo.GetModule(); OUString aModName = rInfo.GetModule();
::rtl::OUString sModuleCode; OUString sModuleCode;
if ( aDocument.createModule( aLibName, aModName, false, sModuleCode ) ) if ( aDocument.createModule( aLibName, aModName, false, sModuleCode ) )
pModule = pBasic->FindModule( aModName ); pModule = pBasic->FindModule( aModName );
} }
...@@ -351,14 +351,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -351,14 +351,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
if ( aWindowTable.find( rTabId.GetValue() ) != aWindowTable.end() ) if ( aWindowTable.find( rTabId.GetValue() ) != aWindowTable.end() )
{ {
BaseWindow* pWin = aWindowTable[ rTabId.GetValue() ]; BaseWindow* pWin = aWindowTable[ rTabId.GetValue() ];
::rtl::OUString aNewName( rModName.GetValue() ); OUString aNewName( rModName.GetValue() );
::rtl::OUString aOldName( pWin->GetName() ); OUString aOldName( pWin->GetName() );
if ( aNewName != aOldName ) if ( aNewName != aOldName )
{ {
bool bRenameOk = false; bool bRenameOk = false;
if (ModulWindow* pModWin = dynamic_cast<ModulWindow*>(pWin)) if (ModulWindow* pModWin = dynamic_cast<ModulWindow*>(pWin))
{ {
rtl::OUString aLibName = pModWin->GetLibName(); OUString aLibName = pModWin->GetLibName();
ScriptDocument aDocument( pWin->GetDocument() ); ScriptDocument aDocument( pWin->GetDocument() );
if (RenameModule(pModWin, aDocument, aLibName, aOldName, aNewName)) if (RenameModule(pModWin, aDocument, aLibName, aOldName, aNewName))
...@@ -437,7 +437,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -437,7 +437,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
uno::Reference< frame::XModel > xModel( rShellItem.GetValue(), UNO_QUERY ); uno::Reference< frame::XModel > xModel( rShellItem.GetValue(), UNO_QUERY );
ScriptDocument aDocument( xModel.is() ? ScriptDocument( xModel ) : ScriptDocument::getApplicationScriptDocument() ); ScriptDocument aDocument( xModel.is() ? ScriptDocument( xModel ) : ScriptDocument::getApplicationScriptDocument() );
const SfxStringItem& rLibNameItem = (const SfxStringItem&)rReq.GetArgs()->Get( SID_BASICIDE_ARG_LIBNAME ); const SfxStringItem& rLibNameItem = (const SfxStringItem&)rReq.GetArgs()->Get( SID_BASICIDE_ARG_LIBNAME );
::rtl::OUString aLibName( rLibNameItem.GetValue() ); OUString aLibName( rLibNameItem.GetValue() );
if ( nSlot == SID_BASICIDE_LIBSELECTED ) if ( nSlot == SID_BASICIDE_LIBSELECTED )
{ {
...@@ -453,7 +453,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -453,7 +453,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) ) if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) )
{ {
::rtl::OUString aPassword; OUString aPassword;
bOK = QueryPassword( xModLibContainer, aLibName, aPassword ); bOK = QueryPassword( xModLibContainer, aLibName, aPassword );
} }
} }
...@@ -512,8 +512,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -512,8 +512,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
DBG_ASSERT( rReq.GetArgs(), "arguments expected" ); DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX ); const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
ScriptDocument aDocument( rSbxItem.GetDocument() ); ScriptDocument aDocument( rSbxItem.GetDocument() );
::rtl::OUString aLibName( rSbxItem.GetLibName() ); OUString aLibName( rSbxItem.GetLibName() );
::rtl::OUString aName( rSbxItem.GetName() ); OUString aName( rSbxItem.GetName() );
if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument && aLibName == m_aCurLibName ) ) if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument && aLibName == m_aCurLibName ) )
{ {
if ( rSbxItem.GetType() == TYPE_MODULE ) if ( rSbxItem.GetType() == TYPE_MODULE )
...@@ -538,8 +538,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -538,8 +538,8 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
DBG_ASSERT( rReq.GetArgs(), "arguments expected" ); DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX ); const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
ScriptDocument aDocument( rSbxItem.GetDocument() ); ScriptDocument aDocument( rSbxItem.GetDocument() );
::rtl::OUString aLibName( rSbxItem.GetLibName() ); OUString aLibName( rSbxItem.GetLibName() );
::rtl::OUString aName( rSbxItem.GetName() ); OUString aName( rSbxItem.GetName() );
SetCurLib( aDocument, aLibName ); SetCurLib( aDocument, aLibName );
BaseWindow* pWin = 0; BaseWindow* pWin = 0;
if ( rSbxItem.GetType() == TYPE_DIALOG ) if ( rSbxItem.GetType() == TYPE_DIALOG )
...@@ -567,7 +567,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -567,7 +567,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false ); SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false );
if ( pDocumentItem ) if ( pDocumentItem )
{ {
::rtl::OUString sDocumentCaption = pDocumentItem->GetValue(); OUString sDocumentCaption = pDocumentItem->GetValue();
if ( !sDocumentCaption.isEmpty() ) if ( !sDocumentCaption.isEmpty() )
pDocument.reset( new ScriptDocument( ScriptDocument::getDocumentWithURLOrCaption( sDocumentCaption ) ) ); pDocument.reset( new ScriptDocument( ScriptDocument::getDocumentWithURLOrCaption( sDocumentCaption ) ) );
} }
...@@ -587,16 +587,16 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) ...@@ -587,16 +587,16 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
if ( !pLibNameItem ) if ( !pLibNameItem )
break; break;
::rtl::OUString aLibName( pLibNameItem->GetValue() ); OUString aLibName( pLibNameItem->GetValue() );
pDocument->loadLibraryIfExists( E_SCRIPTS, aLibName ); pDocument->loadLibraryIfExists( E_SCRIPTS, aLibName );
SetCurLib( *pDocument, aLibName ); SetCurLib( *pDocument, aLibName );
SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_BASICIDE_ARG_NAME, false ); SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_BASICIDE_ARG_NAME, false );
if ( pNameItem ) if ( pNameItem )
{ {
::rtl::OUString aName( pNameItem->GetValue() ); OUString aName( pNameItem->GetValue() );
::rtl::OUString aModType(RTL_CONSTASCII_USTRINGPARAM("Module")); OUString aModType( "Module" );
::rtl::OUString aDlgType(RTL_CONSTASCII_USTRINGPARAM("Dialog")); OUString aDlgType( "Dialog" );
::rtl::OUString aType( aModType ); OUString aType( aModType );
SFX_REQUEST_ARG( rReq, pTypeItem, SfxStringItem, SID_BASICIDE_ARG_TYPE, false ); SFX_REQUEST_ARG( rReq, pTypeItem, SfxStringItem, SID_BASICIDE_ARG_TYPE, false );
if ( pTypeItem ) if ( pTypeItem )
aType = pTypeItem->GetValue(); aType = pTypeItem->GetValue();
...@@ -839,7 +839,7 @@ void Shell::GetState(SfxItemSet &rSet) ...@@ -839,7 +839,7 @@ void Shell::GetState(SfxItemSet &rSet)
break; break;
case SID_BASICIDE_LIBSELECTOR: case SID_BASICIDE_LIBSELECTOR:
{ {
::rtl::OUString aName; OUString aName;
if ( !m_aCurLibName.isEmpty() ) if ( !m_aCurLibName.isEmpty() )
{ {
LibraryLocation eLocation = m_aCurDocument.getLibraryLocation( m_aCurLibName ); LibraryLocation eLocation = m_aCurDocument.getLibraryLocation( m_aCurLibName );
...@@ -851,7 +851,7 @@ void Shell::GetState(SfxItemSet &rSet) ...@@ -851,7 +851,7 @@ void Shell::GetState(SfxItemSet &rSet)
break; break;
case SID_SEARCH_ITEM: case SID_SEARCH_ITEM:
{ {
::rtl::OUString aSelected = GetSelectionText(true); OUString aSelected = GetSelectionText(true);
SvxSearchItem& rItem = GetExtraData()->GetSearchItem(); SvxSearchItem& rItem = GetExtraData()->GetSearchItem();
rItem.SetSearchString( aSelected ); rItem.SetSearchString( aSelected );
rSet.Put( rItem ); rSet.Put( rItem );
...@@ -859,7 +859,7 @@ void Shell::GetState(SfxItemSet &rSet) ...@@ -859,7 +859,7 @@ void Shell::GetState(SfxItemSet &rSet)
break; break;
case SID_BASICIDE_STAT_DATE: case SID_BASICIDE_STAT_DATE:
{ {
::rtl::OUString aDate(RTL_CONSTASCII_USTRINGPARAM("Datum?!")); OUString aDate( "Datum?!" );
SfxStringItem aItem( SID_BASICIDE_STAT_DATE, aDate ); SfxStringItem aItem( SID_BASICIDE_STAT_DATE, aDate );
rSet.Put( aItem ); rSet.Put( aItem );
} }
...@@ -887,7 +887,7 @@ void Shell::GetState(SfxItemSet &rSet) ...@@ -887,7 +887,7 @@ void Shell::GetState(SfxItemSet &rSet)
{ {
if ( pCurWin ) if ( pCurWin )
{ {
::rtl::OUString aTitle = pCurWin->CreateQualifiedName(); OUString aTitle = pCurWin->CreateQualifiedName();
SfxStringItem aItem( SID_BASICIDE_STAT_TITLE, aTitle ); SfxStringItem aItem( SID_BASICIDE_STAT_TITLE, aTitle );
rSet.Put( aItem ); rSet.Put( aItem );
} }
...@@ -910,7 +910,7 @@ void Shell::GetState(SfxItemSet &rSet) ...@@ -910,7 +910,7 @@ void Shell::GetState(SfxItemSet &rSet)
rSet.DisableItem( nWh ); rSet.DisableItem( nWh );
else else
{ {
::rtl::OUString aItemStr; OUString aItemStr;
boost::shared_ptr<LocalizationMgr> pCurMgr(GetCurLocalizationMgr()); boost::shared_ptr<LocalizationMgr> pCurMgr(GetCurLocalizationMgr());
if ( pCurMgr->isLibraryLocalized() ) if ( pCurMgr->isLibraryLocalized() )
{ {
...@@ -919,7 +919,7 @@ void Shell::GetState(SfxItemSet &rSet) ...@@ -919,7 +919,7 @@ void Shell::GetState(SfxItemSet &rSet)
sal_Int32 i, nCount = aLocaleSeq.getLength(); sal_Int32 i, nCount = aLocaleSeq.getLength();
// Force different results for any combination of locales and default locale // Force different results for any combination of locales and default locale
::rtl::OUString aLangStr; OUString aLangStr;
for ( i = 0; i <= nCount; ++i ) for ( i = 0; i <= nCount; ++i )
{ {
lang::Locale aLocale; lang::Locale aLocale;
...@@ -1051,11 +1051,11 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe ...@@ -1051,11 +1051,11 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe
void Shell::ManageToolbars() void Shell::ManageToolbars()
{ {
static ::rtl::OUString aLayoutManagerName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); static OUString aLayoutManagerName( "LayoutManager" );
static ::rtl::OUString aMacroBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/macrobar" )); static OUString aMacroBarResName( "private:resource/toolbar/macrobar" );
static ::rtl::OUString aDialogBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/dialogbar" )); static OUString aDialogBarResName( "private:resource/toolbar/dialogbar" );
static ::rtl::OUString aInsertControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcontrolsbar" )); static OUString aInsertControlsBarResName( "private:resource/toolbar/insertcontrolsbar" );
static ::rtl::OUString aFormControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/formcontrolsbar" )); static OUString aFormControlsBarResName( "private:resource/toolbar/formcontrolsbar" );
(void)aInsertControlsBarResName; (void)aInsertControlsBarResName;
if( !pCurWin ) if( !pCurWin )
...@@ -1099,7 +1099,7 @@ BaseWindow* Shell::FindApplicationWindow() ...@@ -1099,7 +1099,7 @@ BaseWindow* Shell::FindApplicationWindow()
BaseWindow* Shell::FindWindow( BaseWindow* Shell::FindWindow(
ScriptDocument const& rDocument, ScriptDocument const& rDocument,
rtl::OUString const& rLibName, rtl::OUString const& rName, OUString const& rLibName, OUString const& rName,
ItemType eType, bool bFindSuspended ItemType eType, bool bFindSuspended
) )
{ {
...@@ -1153,7 +1153,7 @@ long Shell::CallBasicBreakHdl( StarBASIC* pBasic ) ...@@ -1153,7 +1153,7 @@ long Shell::CallBasicBreakHdl( StarBASIC* pBasic )
ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic ) ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic )
{ {
SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false ); SetCurLib( ScriptDocument::getApplicationScriptDocument(), OUString(), false );
SbModule* pActiveModule = StarBASIC::GetActiveModule(); SbModule* pActiveModule = StarBASIC::GetActiveModule();
if (SbClassModuleObject* pCMO = dynamic_cast<SbClassModuleObject*>(pActiveModule)) if (SbClassModuleObject* pCMO = dynamic_cast<SbClassModuleObject*>(pActiveModule))
...@@ -1169,7 +1169,7 @@ ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic ) ...@@ -1169,7 +1169,7 @@ ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic )
if (BasicManager* pBasMgr = FindBasicManager(pLib)) if (BasicManager* pBasMgr = FindBasicManager(pLib))
{ {
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
::rtl::OUString aLibName = pLib->GetName(); OUString aLibName = pLib->GetName();
pWin = FindBasWin( aDocument, aLibName, pActiveModule->GetName(), true ); pWin = FindBasWin( aDocument, aLibName, pActiveModule->GetName(), true );
DBG_ASSERT( pWin, "Error/Step-Hdl: Fenster wurde nicht erzeugt/gefunden!" ); DBG_ASSERT( pWin, "Error/Step-Hdl: Fenster wurde nicht erzeugt/gefunden!" );
SetCurLib( aDocument, aLibName ); SetCurLib( aDocument, aLibName );
...@@ -1260,7 +1260,7 @@ void Shell::Deactivate( sal_Bool bMDI ) ...@@ -1260,7 +1260,7 @@ void Shell::Deactivate( sal_Bool bMDI )
if ( /* !pWin->IsSuspended() && */ !pWin->CanClose() ) if ( /* !pWin->IsSuspended() && */ !pWin->CanClose() )
{ {
if ( !m_aCurLibName.isEmpty() && ( pWin->IsDocument( m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) ) if ( !m_aCurLibName.isEmpty() && ( pWin->IsDocument( m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) )
SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false ); SetCurLib( ScriptDocument::getApplicationScriptDocument(), OUString(), false );
SetCurWindow( pWin, true ); SetCurWindow( pWin, true );
break; break;
} }
......
basctl/source/basicide/bastype2.hxx
Dosyayı görüntüle @ 554a45f2
...@@ -91,28 +91,28 @@ public: ...@@ -91,28 +91,28 @@ public:
class LibEntry : public DocumentEntry class LibEntry : public DocumentEntry
{ {
private: private:
rtl::OUString m_aLibName; OUString m_aLibName;
public: public:
LibEntry ( LibEntry (
ScriptDocument const& rDocument, ScriptDocument const& rDocument,
LibraryLocation eLocation, LibraryLocation eLocation,
rtl::OUString const& rLibName, OUString const& rLibName,
EntryType eType = OBJ_TYPE_LIBRARY EntryType eType = OBJ_TYPE_LIBRARY
); );
virtual ~LibEntry (); virtual ~LibEntry ();
rtl::OUString const& GetLibName () const { return m_aLibName; } OUString const& GetLibName () const { return m_aLibName; }
}; };
class EntryDescriptor class EntryDescriptor
{ {
ScriptDocument m_aDocument; ScriptDocument m_aDocument;
LibraryLocation m_eLocation; LibraryLocation m_eLocation;
rtl::OUString m_aLibName; OUString m_aLibName;
rtl::OUString m_aLibSubName; // for vba entry: Document Objects, Class Modules, Forms and Normal Modules OUString m_aLibSubName; // for vba entry: Document Objects, Class Modules, Forms and Normal Modules
rtl::OUString m_aName; OUString m_aName;
rtl::OUString m_aMethodName; OUString m_aMethodName;
EntryType m_eType; EntryType m_eType;
public: public:
...@@ -120,18 +120,18 @@ public: ...@@ -120,18 +120,18 @@ public:
EntryDescriptor ( EntryDescriptor (
ScriptDocument const& rDocument, ScriptDocument const& rDocument,
LibraryLocation eLocation, LibraryLocation eLocation,
rtl::OUString const& rLibName, OUString const& rLibName,
rtl::OUString const& rLibSubName, OUString const& rLibSubName,
rtl::OUString const& rName, OUString const& rName,
EntryType eType EntryType eType
); );
EntryDescriptor ( EntryDescriptor (
ScriptDocument const& rDocument, ScriptDocument const& rDocument,
LibraryLocation eLocation, LibraryLocation eLocation,
rtl::OUString const& rLibName, OUString const& rLibName,
rtl::OUString const& rLibSubName, OUString const& rLibSubName,
rtl::OUString const& rName, OUString const& rName,
rtl::OUString const& rMethodName, OUString const& rMethodName,
EntryType eType EntryType eType
); );
virtual ~EntryDescriptor (); virtual ~EntryDescriptor ();
...@@ -144,17 +144,17 @@ public: ...@@ -144,17 +144,17 @@ public:
LibraryLocation GetLocation() const { return m_eLocation; } LibraryLocation GetLocation() const { return m_eLocation; }
void SetLocation( LibraryLocation eLocation ) { m_eLocation = eLocation; } void SetLocation( LibraryLocation eLocation ) { m_eLocation = eLocation; }
const ::rtl::OUString& GetLibName() const { return m_aLibName; } const OUString& GetLibName() const { return m_aLibName; }
void SetLibName( const ::rtl::OUString& aLibName ) { m_aLibName = aLibName; } void SetLibName( const OUString& aLibName ) { m_aLibName = aLibName; }
const ::rtl::OUString& GetLibSubName() const { return m_aLibSubName; } const OUString& GetLibSubName() const { return m_aLibSubName; }
void SetLibSubName( const ::rtl::OUString& aLibSubName ) { m_aLibSubName = aLibSubName; } void SetLibSubName( const OUString& aLibSubName ) { m_aLibSubName = aLibSubName; }
const ::rtl::OUString& GetName() const { return m_aName; } const OUString& GetName() const { return m_aName; }
void SetName( const ::rtl::OUString& aName ) { m_aName = aName; } void SetName( const OUString& aName ) { m_aName = aName; }
const ::rtl::OUString& GetMethodName() const { return m_aMethodName; } const OUString& GetMethodName() const { return m_aMethodName; }
void SetMethodName( const ::rtl::OUString& aMethodName ) { m_aMethodName = aMethodName; } void SetMethodName( const OUString& aMethodName ) { m_aMethodName = aMethodName; }
EntryType GetType() const { return m_eType; } EntryType GetType() const { return m_eType; }
void SetType( EntryType eType ) { m_eType = eType; } void SetType( EntryType eType ) { m_eType = eType; }
...@@ -188,10 +188,10 @@ protected: ...@@ -188,10 +188,10 @@ protected:
virtual long ExpandingHdl(); virtual long ExpandingHdl();
void ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ); void ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const ::rtl::OUString& rLibName ); void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText ); SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText );
// DocumentEventListener // DocumentEventListener
virtual void onDocumentCreated( const ScriptDocument& _rDocument ); virtual void onDocumentCreated( const ScriptDocument& _rDocument );
...@@ -220,7 +220,7 @@ public: ...@@ -220,7 +220,7 @@ public:
SbModule* FindModule( SvLBoxEntry* pEntry ); SbModule* FindModule( SvLBoxEntry* pEntry );
SbxVariable* FindVariable( SvLBoxEntry* pEntry ); SbxVariable* FindVariable( SvLBoxEntry* pEntry );
SvLBoxEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); SvLBoxEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const ::rtl::OUString& rText, EntryType eType ); SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType );
EntryDescriptor GetEntryDescriptor( SvLBoxEntry* pEntry ); EntryDescriptor GetEntryDescriptor( SvLBoxEntry* pEntry );
...@@ -228,14 +228,14 @@ public: ...@@ -228,14 +228,14 @@ public:
bool IsValidEntry( SvLBoxEntry* pEntry ); bool IsValidEntry( SvLBoxEntry* pEntry );
SvLBoxEntry* AddEntry( SvLBoxEntry* AddEntry(
const ::rtl::OUString& rText, const Image& rImage, const OUString& rText, const Image& rImage,
SvLBoxEntry* pParent, bool bChildrenOnDemand, SvLBoxEntry* pParent, bool bChildrenOnDemand,
std::auto_ptr<Entry> aUserData std::auto_ptr<Entry> aUserData
); );
void RemoveEntry (SvLBoxEntry*); void RemoveEntry (SvLBoxEntry*);
void RemoveEntry (ScriptDocument const&); void RemoveEntry (ScriptDocument const&);
::rtl::OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const;
void GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage ); void GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage );
void SetCurrentEntry (EntryDescriptor&); void SetCurrentEntry (EntryDescriptor&);
......
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