[Libreoffice-commits] core.git: dbaccess/source

Julien Nabet serval2412 at yahoo.fr
Sun Feb 8 13:27:43 PST 2015


 dbaccess/source/ui/browser/unodatbr.cxx            |    6 +++---
 dbaccess/source/ui/inc/browserids.hxx              |    2 +-
 dbaccess/source/ui/inc/querycontroller.hxx         |    2 +-
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |    2 +-
 dbaccess/source/ui/querydesign/querycontroller.cxx |    6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 195f3c9814af937e47d1bae8bbfad609dde86408
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Feb 8 22:25:58 2015 +0100

    Typo: esacpe->escape
    
    Change-Id: I9f22dd49aeca5f01c8d582c54ca157f502a6ee1f

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 8dc5cb1..3e8b396 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3089,7 +3089,7 @@ void SbaTableQueryBrowser::impl_initialize()
 
     OUString aTableName, aCatalogName, aSchemaName;
 
-    bool bEsacpeProcessing = true;
+    bool bEscapeProcessing = true;
     sal_Int32 nInitialDisplayCommandType = CommandType::COMMAND;
     OUString sInitialDataSourceName;
     OUString sInitialCommand;
@@ -3103,7 +3103,7 @@ void SbaTableQueryBrowser::impl_initialize()
     rArguments.get_ensureType( OUString(PROPERTY_UPDATE_CATALOGNAME), aCatalogName );
     rArguments.get_ensureType( OUString(PROPERTY_UPDATE_SCHEMANAME), aSchemaName );
     rArguments.get_ensureType( OUString(PROPERTY_UPDATE_TABLENAME), aTableName );
-    rArguments.get_ensureType( OUString(PROPERTY_ESCAPE_PROCESSING), bEsacpeProcessing );
+    rArguments.get_ensureType( OUString(PROPERTY_ESCAPE_PROCESSING), bEscapeProcessing );
     rArguments.get_ensureType( "Frame", xFrame );
     rArguments.get_ensureType( OUString(PROPERTY_SHOWMENU), m_bShowMenu );
 
@@ -3230,7 +3230,7 @@ void SbaTableQueryBrowser::impl_initialize()
         m_aDocScriptSupport = ::boost::optional< bool >( Reference< XEmbeddedScripts >( xDocument, UNO_QUERY ).is() );
     }
 
-    if ( implSelect( sInitialDataSourceName, sInitialCommand, nInitialDisplayCommandType, bEsacpeProcessing, xConnection, true ) )
+    if ( implSelect( sInitialDataSourceName, sInitialCommand, nInitialDisplayCommandType, bEscapeProcessing, xConnection, true ) )
     {
         try
         {
diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx
index 0681883..9e0879b 100644
--- a/dbaccess/source/ui/inc/browserids.hxx
+++ b/dbaccess/source/ui/inc/browserids.hxx
@@ -93,7 +93,7 @@
 #define ID_BROWSER_QUERY_EXECUTE            SID_FM_EXECUTE
 
 #define ID_BROWSER_CLOSE                    SID_CLOSEWIN
-#define ID_BROWSER_ESACPEPROCESSING         SID_FM_NATIVESQL
+#define ID_BROWSER_ESCAPEPROCESSING         SID_FM_NATIVESQL
 
 #define ID_QUERY_FUNCTION                   (SID_SBA_START + 41) // Funktionen anzeigen
 #define ID_QUERY_TABLENAME                  (SID_SBA_START + 42) // Tabellennamen anzeigen
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 35d9165..72f9b90 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -143,7 +143,7 @@ namespace dbaui
         virtual void impl_onModifyChanged() SAL_OVERRIDE;
 
         // should the statement be parsed by our own sql parser
-        bool        isEsacpeProcessing()    const { return m_bEscapeProcessing; }
+        bool        isEscapeProcessing()    const { return m_bEscapeProcessing; }
         bool        isGraphicalDesign()     const { return m_bGraphicalDesign; }
         bool        isDistinct()            const { return m_bDistinct; }
         sal_Int64       getLimit()              const { return m_nLimit; }
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 032ca0d..0107c0f 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1936,7 +1936,7 @@ namespace
                 break;
             }
 
-            if ( !rController.isEsacpeProcessing() ) // not allowed in this mode
+            if ( !rController.isEscapeProcessing() ) // not allowed in this mode
             {
                 eErrorCode = eNativeMode;
                 break;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index c4cde09..22d715f 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -489,7 +489,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
                 aReturn = OJoinController::GetState( _nId );
             break;
 
-        case ID_BROWSER_ESACPEPROCESSING:
+        case ID_BROWSER_ESCAPEPROCESSING:
             aReturn.bChecked = !m_bEscapeProcessing;
             aReturn.bEnabled = ( m_pSqlIterator != NULL ) && !m_bGraphicalDesign;
             break;
@@ -569,7 +569,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
 {
     switch(_nId)
     {
-        case ID_BROWSER_ESACPEPROCESSING:
+        case ID_BROWSER_ESCAPEPROCESSING:
             setEscapeProcessing_fireEvent( !m_bEscapeProcessing );
             if ( !editingView() )
                 setModified(sal_True);
@@ -1131,7 +1131,7 @@ void OQueryController::describeSupportedFeatures()
 {
     OJoinController::describeSupportedFeatures();
     implDescribeSupportedFeature( ".uno:SaveAs",            ID_BROWSER_SAVEASDOC,       CommandGroup::DOCUMENT );
-    implDescribeSupportedFeature( ".uno:SbaNativeSql",      ID_BROWSER_ESACPEPROCESSING,CommandGroup::FORMAT );
+    implDescribeSupportedFeature( ".uno:SbaNativeSql",      ID_BROWSER_ESCAPEPROCESSING,CommandGroup::FORMAT );
     implDescribeSupportedFeature( ".uno:DBViewFunctions",   SID_QUERY_VIEW_FUNCTIONS,   CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:DBViewTableNames",  SID_QUERY_VIEW_TABLES,      CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:DBViewAliases",     SID_QUERY_VIEW_ALIASES,     CommandGroup::VIEW );


More information about the Libreoffice-commits mailing list