Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


Cheers,
Wol
From 0f2cb83423d6d44c86eac621075c9e7d1383aee8 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Wed, 10 Nov 2010 10:56:50 +0000
Subject: [PATCH 1/4] Fix spelling mistake

---
 .../source/core/recovery/subcomponentrecovery.cxx  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx 
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 32d213d..bb84cce 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -506,7 +506,7 @@ namespace dbaccess
         case REPORT:
             if ( sModuleIdentifier.equalsAscii( "com.sun.star.report.ReportDefinition" ) )
             {
-                // it's an SRB report desginer
+                // it's an SRB report designer
                 m_aCompDesc.bForEditing = true;
                 break;
             }
-- 
1.7.2.2

From 7c2b09b187a00c60b8628a6a78131a040bcfc40f Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Wed, 10 Nov 2010 11:17:17 +0000
Subject: [PATCH 2/4] Fix spelling mistakes

---
 .../source/ext/macromigration/migrationengine.cxx  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx 
b/dbaccess/source/ext/macromigration/migrationengine.cxx
index c354335..d0bc950 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1163,7 +1163,7 @@ namespace dbmm
         aProgressMixer.registerPhase( PHASE_PYTHON, 1 );
         aProgressMixer.registerPhase( PHASE_JAVA, 1 );
         aProgressMixer.registerPhase( PHASE_BASIC, 5 );
-            // more weight than then others, assuming that usually, there are much more Basic 
macros than any other scripts
+            // more weight than the others, assuming that usually, there are many more Basic 
macros than any other scripts
         aProgressMixer.registerPhase( PHASE_DIALOGS, 1 );
 
         bool bSuccess = impl_checkScriptStorageStructure_nothrow( aSubDocument );
@@ -1232,7 +1232,7 @@ namespace dbmm
             // The bug requesting to change this is #i95409#.
             // Unfortunately, the storage implementation does not complain if you use invalid 
characters/names, but instead
             // it silently accepts them, and produces garbage in the file (#i95408).
-            // So, until especially the former is fixed, we need to strip the name from all 
invalid characters.
+            // So, until especially the former is fixed, we need to strip the name of all invalid 
characters.
             // #i95865# / 2008-11-06 / frank.schoenheit@sun.com
 
             // The general idea is to replace invalid characters with '_'. However, since "valid" 
essentially means
-- 
1.7.2.2

From a8d4cb3322407159bcbc62df30861ba8def58512 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Wed, 10 Nov 2010 11:24:29 +0000
Subject: [PATCH 3/4] Translation, spelling mistakes and dead code

---
 dbaccess/source/filter/migration/cfgimport.cxx |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dbaccess/source/filter/migration/cfgimport.cxx 
b/dbaccess/source/filter/migration/cfgimport.cxx
index 75b23cc..a116fa5 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -302,7 +302,7 @@ void LoadTableFieldDesc(const Reference< XObjectInputStream>& _rxIn,PropertyValu
     ::rtl::OUString            aFieldName;             // column
     ::rtl::OUString            aFieldAlias;    // column alias
     ::rtl::OUString            aDatabaseName;  // qualifier or catalog
-    ::rtl::OUString            aFunctionName;  // enth"alt den Funktionsnamen, nur wenn 
eFunctionType != FKT_NONE gesetzt
+    ::rtl::OUString            aFunctionName;  // contains the function name, ?but only when 
"eFunctionType != FKT_NONE" is set?
 
     sal_Int32                  eDataType;
     sal_Int32                  eFunctionType;
@@ -509,7 +509,7 @@ void OCfgImport::createDataSource(const ::rtl::OUString& _sName)
         while( aRet.SearchAndReplaceAscii( "*.", String() ) != STRING_NOTFOUND ) ;
         sExtension = aRet;
     }
-    // then look for which of them settings are stored in the configuration
+    // then look for which of the settings are stored in the configuration
     ::rtl::OUString sFileName;
     try
     {
@@ -693,9 +693,6 @@ void SAL_CALL OCfgImport::addOrReplaceNode(
                 break;
         }
     }
-    /*if ( aName.equalsAscii("org.openoffice.Office.DataAccess") )
-        m_aStack.push(TElementStack::value_type(aName,0));
-    else*/
     if ( aName.equalsAscii("DataSources") )
         m_aStack.push(TElementStack::value_type(aName,DATASOURCES));
     else if ( aName.equalsAscii("DataSourceSettings") )
-- 
1.7.2.2

From ade10b7a0cfd54df5c99ba09911a44e02fc4b551 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Wed, 10 Nov 2010 12:51:50 +0000
Subject: [PATCH 4/4] Spelling mistakes and code removal

---
 dbaccess/source/filter/xml/xmlExport.cxx |    8 ++------
 dbaccess/source/filter/xml/xmlHelper.cxx |   28 ----------------------------
 dbaccess/source/filter/xml/xmlfilter.cxx |    4 ++--
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index b299a6a..a9cf210 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -241,10 +241,6 @@ ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16
     m_xExportHelper = new SvXMLExportPropertyMapper(GetTableStylesPropertySetMapper());
     m_xColumnExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
 
-    //UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper = new 
XMLPropertySetMapper(OXMLHelper::GetCellStylesPropertySetMapper(),m_xPropHdlFactory);
-    //m_xCellExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(xCellStylesPropertySetMapper);
-    //m_xCellExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
-    
//m_xCellExportHelper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
     m_xCellExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
     m_xRowExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper());
 
@@ -1234,9 +1230,9 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
                         }
                     }
                     ++aItr;
-                } // while ( aItr != aEnd )
+                }
 
-            } // if ( !aPropStates.empty() )
+            }
             if ( XML_STYLE_FAMILY_TABLE_CELL == pExportHelper[i].second.second )
                 ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), 
::std::back_inserter( aPropStates ));
             if ( !aPropStates.empty() )
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index b5fa3c9..bc11046 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -91,34 +91,6 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe
 {
     static const XMLPropertyMapEntry s_aTableStylesProperties[] =
     {
-        //MAP_CONST( PROPERTY_FONTNAME,                        XML_NAMESPACE_STYLE,    
XML_FONT_NAME,                          XML_TYPE_STRING, 0 ),
-        //MAP_CONST( PROPERTY_TEXTCOLOR,                       XML_NAMESPACE_FO,               
XML_COLOR,                                      XML_TYPE_COLOR, 0 ),
-        //MAP_CONST( PROPERTY_TEXTLINECOLOR,           XML_NAMESPACE_STYLE,    
XML_TEXT_UNDERLINE_COLOR,       XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
-
-        //MAP_CONST( PROPERTY_TEXTRELIEF,                      XML_NAMESPACE_STYLE,    
XML_FONT_RELIEF,                            XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
-        //MAP_CONST( PROPERTY_TEXTEMPHASIS,            XML_NAMESPACE_STYLE,    XML_TEXT_EMPHASIZE, 
                XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
-        //MAP_CONST( PROPERTY_FONTCHARWIDTH,           XML_NAMESPACE_STYLE,    
XML_FONT_CHAR_WIDTH,                XML_TYPE_NUMBER16, 0 ),
-        //MAP_CONST( PROPERTY_FONTCHARSET,             XML_NAMESPACE_STYLE,    XML_FONT_CHARSET,   
                        XML_TYPE_TEXT_FONTENCODING, 0 ),
-        //MAP_CONST( PROPERTY_FONTFAMILY,                      XML_NAMESPACE_STYLE,    
XML_FONT_FAMILY_GENERIC,            XML_TYPE_TEXT_FONTFAMILY, 0 ),
-        //MAP_CONST( PROPERTY_FONTHEIGHT,                      XML_NAMESPACE_FO,               
XML_FONT_SIZE,                              XML_TYPE_MEASURE16, 0 ),
-        //MAP_CONST( PROPERTY_FONTKERNING,             XML_NAMESPACE_STYLE,    XML_LETTER_KERNING, 
                XML_TYPE_BOOL, 0 ),
-        //
-        //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE,    XML_ROTATION_ANGLE,         
        XML_TYPE_ROTATION_ANGLE, 0 ),
-        //MAP_CONST( PROPERTY_FONTPITCH,                       XML_NAMESPACE_STYLE,    
XML_FONT_PITCH,                             XML_TYPE_TEXT_FONTPITCH, 0 ),
-        //MAP_CONST( PROPERTY_FONTSLANT,                       XML_NAMESPACE_FO,               
XML_FONT_STYLE,                             XML_TYPE_TEXT_POSTURE, 0 ),
-        //MAP_CONST_ASCII( "CharStrikeout",            XML_NAMESPACE_STYLE,    
XML_TEXT_LINE_THROUGH_STYLE,    XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
-        //MAP_CONST_ASCII( "CharStrikeout",            XML_NAMESPACE_STYLE,    
XML_TEXT_LINE_THROUGH_TYPE,     XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY,  0),
-        //MAP_CONST_ASCII( "CharStrikeout",            XML_NAMESPACE_STYLE,    
XML_TEXT_LINE_THROUGH_WIDTH,    XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
-        //MAP_CONST_ASCII( "CharStrikeout",            XML_NAMESPACE_STYLE,    
XML_TEXT_LINE_THROUGH_TEXT,     XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY,  0),
-        //MAP_CONST( PROPERTY_FONTSTYLENAME,           XML_NAMESPACE_STYLE,    
XML_FONT_STYLE_NAME,                XML_TYPE_STRING, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",            XML_NAMESPACE_STYLE,    
XML_TEXT_UNDERLINE_STYLE,               XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",            XML_NAMESPACE_STYLE,    
XML_TEXT_UNDERLINE_TYPE,                XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",            XML_NAMESPACE_STYLE,    
XML_TEXT_UNDERLINE_WIDTH,               XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderlineColor",       XML_NAMESPACE_STYLE,    
XML_TEXT_UNDERLINE_COLOR,               XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0    
    ),
-        //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE,        
XML_TEXT_UNDERLINE_COLOR,               XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 
0    ),
-        //MAP_CONST( PROPERTY_FONTWEIGHT,                      XML_NAMESPACE_FO,               
XML_FONT_WEIGHT,                            XML_TYPE_TEXT_WEIGHT, 0 ),
-        //MAP_CONST( PROPERTY_FONTWIDTH,                       XML_NAMESPACE_STYLE,    
XML_FONT_WIDTH,                             XML_TYPE_FONT_WIDTH, 0 ),
-        //MAP_CONST( PROPERTY_FONTWORDLINEMODE,        XML_NAMESPACE_STYLE,    
XML_TEXT_UNDERLINE_MODE,                XML_TYPE_TEXT_LINE_MODE, 0 ),
         MAP_END()
     };
     UniReference < XMLPropertyHandlerFactory> xFac = new 
::xmloff::OControlPropertyHandlerFactory();
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 9805eda..53d1c57 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -124,8 +124,8 @@ namespace dbaxml
                         (void)ex;
                         OSL_ASSERT(0);
                     }
-                } // if ( s_bFirstTime )
-            } // if ( m_eWhat == E_JAVA )
+                }
+            }
             else if ( m_eWhat == E_CALC )
             {
                 static bool s_bFirstTime = true;
-- 
1.7.2.2


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.