basctl/source/basicide/baside2.hxx | 4 +- basctl/source/basicide/baside2b.cxx | 8 ++--- cui/uiconfig/ui/optbasicidepage.ui | 4 +- include/basic/codecompletecache.hxx | 4 +- officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs | 2 - sd/source/ui/inc/custsdlg.hxx | 2 - sd/source/ui/inc/fuconuno.hxx | 2 - sd/source/ui/unoidl/unolayer.cxx | 16 +++++------ sd/source/ui/unoidl/unolayer.hxx | 4 +- 9 files changed, 23 insertions(+), 23 deletions(-)
New commits: commit 33dd0bcae811bcc7061f6c94b378384f2691d71c Author: Ivan Timofeev <timofeev....@gmail.com> Date: Tue Sep 3 12:37:56 2013 +0400 String->OUString Change-Id: I5708992ce73edd96f030ee7bfd5fcd9e0e6fca8a diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index a97143b..1c6e167 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -83,7 +83,7 @@ private: SdDrawDocument& rDoc; SdCustomShow*& rpCustomShow; sal_Bool bModified; - String aOldName; + OUString aOldName; void CheckState(); void CheckCustomShow(); diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index 193d4c0..11adbf9 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -56,7 +56,7 @@ protected: SdDrawDocument* pDoc, SfxRequest& rReq); - String aOldLayer; + OUString aOldLayer; private: sal_uInt32 nInventor; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index fbf14f5..41e3854 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -80,7 +80,7 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet() return &aSDLayerPropertySet_Impl; } -String SdLayer::convertToInternalName( const OUString& rName ) +OUString SdLayer::convertToInternalName( const OUString& rName ) { if ( rName == sUNO_LayerName_background ) { @@ -104,11 +104,11 @@ String SdLayer::convertToInternalName( const OUString& rName ) } else { - return String( rName ); + return rName; } } -OUString SdLayer::convertToExternalName( const String& rName ) +OUString SdLayer::convertToExternalName( const OUString& rName ) { if( rName == SD_RESSTR( STR_LAYER_BCKGRND ) ) { @@ -132,7 +132,7 @@ OUString SdLayer::convertToExternalName( const String& rName ) } else { - return OUString( rName ); + return rName; } } @@ -317,7 +317,7 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() if(pSdrPageView) { - String aLayerName = pLayer->GetName(); + OUString aLayerName = pLayer->GetName(); switch(what) { case VISIBLE: return pSdrPageView->IsLayerVisible(aLayerName); @@ -354,7 +354,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() if(pSdrPageView) { - String aLayerName(pLayer->GetName()); + OUString aLayerName(pLayer->GetName()); switch(what) { case VISIBLE: pSdrPageView->SetLayerVisible(aLayerName,flag); @@ -525,10 +525,10 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin(); sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount(); sal_Int32 nLayer = nLayerCnt - 2 + 1; - String aLayerName; + OUString aLayerName; // Test for existing names - while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) ) + while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName, sal_False) ) { aLayerName = SD_RESSTR(STR_LAYER); aLayerName += OUString::number(nLayer); diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 2208802..6d1ca39 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -54,8 +54,8 @@ public: // intern SdrLayer* GetSdrLayer() const throw() { return pLayer; } - static String convertToInternalName( const OUString& rName ); - static OUString convertToExternalName( const String& rName ); + static OUString convertToInternalName( const OUString& rName ); + static OUString convertToExternalName( const OUString& rName ); // uno helper UNO3_GETIMPLEMENTATION_DECL( SdLayer ) commit b0184ebaa4dcc2ad2eb2a258e21212e9e4a74175 Author: Ivan Timofeev <timofeev....@gmail.com> Date: Tue Sep 3 12:36:49 2013 +0400 completition->completion :) Change-Id: I7a5ae7cc0d6a253bbc27db076babedd65c89be1a diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 9bafa51..85a1d88 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -128,8 +128,8 @@ private: void HandleAutoCorrect(); void HandleAutoCloseParen(); void HandleAutoCloseDoubleQuotes(); - void HandleCodeCompletition(); - void HandleProcedureCompletition(); + void HandleCodeCompletion(); + void HandleProcedureCompletion(); TextSelection GetLastHighlightPortionTextSelection(); protected: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index a68e77f..69012cc 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -536,12 +536,12 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN && CodeCompleteOptions::IsProcedureAutoCompleteOn() ) {//autoclose implementation - HandleProcedureCompletition(); + HandleProcedureCompletion(); } if( rKEvt.GetKeyCode().GetCode() == KEY_POINT && CodeCompleteOptions::IsCodeCompleteOn() ) { - HandleCodeCompletition(); + HandleCodeCompletion(); } if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() ) ) { @@ -729,7 +729,7 @@ void EditorWindow::HandleAutoCloseDoubleQuotes() } } -void EditorWindow::HandleProcedureCompletition() +void EditorWindow::HandleProcedureCompletion() { TextSelection aSel = GetEditView()->GetSelection(); sal_uLong nLine = aSel.GetStart().GetPara(); @@ -809,7 +809,7 @@ void EditorWindow::HandleProcedureCompletition() } } -void EditorWindow::HandleCodeCompletition() +void EditorWindow::HandleCodeCompletion() { rModulWindow.UpdateModule(); rModulWindow.GetSbModule()->GetCodeCompleteDataFromParse(aCodeCompleteCache); diff --git a/cui/uiconfig/ui/optbasicidepage.ui b/cui/uiconfig/ui/optbasicidepage.ui index 5785ca6..14ade61 100644 --- a/cui/uiconfig/ui/optbasicidepage.ui +++ b/cui/uiconfig/ui/optbasicidepage.ui @@ -25,7 +25,7 @@ <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="codecomplete_enable"> - <property name="label" translatable="yes">Enable Code Completition</property> + <property name="label" translatable="yes">Enable Code Completion</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -47,7 +47,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Code Completition</property> + <property name="label" translatable="yes">Code Completion</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx index e85b0d8..a4c578d 100644 --- a/include/basic/codecompletecache.hxx +++ b/include/basic/codecompletecache.hxx @@ -37,7 +37,7 @@ typedef boost::unordered_map< OUString, CodeCompleteVarTypes, OUStringHash > Cod class BASIC_DLLPUBLIC CodeCompleteOptions { /* - * class to store basic code completition + * class to store basic code completion * options * */ private: @@ -75,7 +75,7 @@ class BASIC_DLLPUBLIC CodeCompleteDataCache { /* * cache to store data for - * code completition + * code completion * */ private: CodeCompleteVarScopes aVarScopes; diff --git a/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs b/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs index 2d8ffc4..9bf9b3d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs @@ -28,7 +28,7 @@ </info> <prop oor:name="CodeComplete" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Sets the code completition on/off. Default is false.</desc> + <desc>Sets the code completion on/off. Default is false.</desc> </info> <value>false</value> </prop> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits