summaryrefslogtreecommitdiff
path: root/l10ntools/source/inireader.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:18:13 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:18:13 +0200
commitb817eb954419c818e04432e87af692bc0f53ce18 (patch)
tree1f51e4435aa74ba91c752831f08caee599ff0d43 /l10ntools/source/inireader.cxx
parent8ade1b264b756914ca121db4379cbbe709b7eb89 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit f4e5c3d6e530c85d1d9be70f2f3b4f5b35d6db80 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:07 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit a7febbdcdc9fd4a80e8357f3812456fc3fa0f39f Author: Radek Doulik <rodo@novell.com> Date: Thu Mar 10 15:47:35 2011 +0100 fix for 3.3.2 blocker fdo#34718 - change the type of nDrawerHeight to long - before it became big positive long in the called Point::Move function, moving the drawer under the visible area. so it was basically signed/unsigned problem in the layouter svtools/source/toolpanel/drawerlayouter.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: libs-gui_libreoffice-3.3.3.1
Diffstat (limited to 'l10ntools/source/inireader.cxx')
-rw-r--r--l10ntools/source/inireader.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/l10ntools/source/inireader.cxx b/l10ntools/source/inireader.cxx
index 003902087469..051059560ef4 100644
--- a/l10ntools/source/inireader.cxx
+++ b/l10ntools/source/inireader.cxx
@@ -12,8 +12,8 @@ namespace transex3
bool INIreader::read( INImap& myMap , string& filename )
{
- ifstream aFStream( filename.c_str() );
- if( aFStream && aFStream.is_open())
+ ifstream aFStream( filename.c_str() );
+ if( aFStream && aFStream.is_open())
{
string line;
string section;
@@ -28,7 +28,7 @@ bool INIreader::read( INImap& myMap , string& filename )
}
else if( is_section( line , section ) )
{
- //cerr << "[" << section << "]\n";
+ //cerr << "[" << section << "]\n";
myvalues = new stringmap();
myMap[ section ] = myvalues ;
}
@@ -48,9 +48,9 @@ bool INIreader::read( INImap& myMap , string& filename )
}
}
- if( aFStream.is_open() )
+ if( aFStream.is_open() )
aFStream.close();
-
+
return true;
}
else
@@ -65,7 +65,7 @@ bool INIreader::is_section( string& line , string& section_str )
// Error in regex ?
check_status( section_status );
UnicodeString target( line.c_str() , line.length() );
-
+
section_match->reset( target );
check_status( section_status );
@@ -75,7 +75,7 @@ bool INIreader::is_section( string& line , string& section_str )
UnicodeString result( section_match->group( 1 , section_status) );
check_status( section_status );
toStlString( result , section_str );
-
+
return true;
}
return false;
@@ -86,21 +86,21 @@ bool INIreader::is_parameter( string& line , string& parameter_key , string& par
// Error in regex ?
check_status( parameter_status );
UnicodeString target( line.c_str() , line.length() );
-
+
parameter_match->reset( target );
check_status( parameter_status );
if( parameter_match->find() )
{
check_status( parameter_status );
-
+
UnicodeString result1( parameter_match->group( 1 , parameter_status) );
check_status( parameter_status );
toStlString( result1 , parameter_key );
UnicodeString result2( parameter_match->group( 2 , parameter_status) );
check_status( parameter_status );
toStlString( result2 , parameter_value );
-
+
return true;
}
return false;
@@ -109,7 +109,7 @@ bool INIreader::is_parameter( string& line , string& parameter_key , string& par
void INIreader::check_status( UErrorCode status )
{
if( U_FAILURE( status) )
- {
+ {
cerr << "Error in or while using regex: " << u_errorName( status ) << "\n";
exit(-1);
}
@@ -117,7 +117,7 @@ void INIreader::check_status( UErrorCode status )
void INIreader::toStlString( const UnicodeString& str , string& stl_str)
{
- // convert to string
+ // convert to string
char* buffer = new char[ str.length()*3 ];
str.extract( 0 , str.length() , buffer );
stl_str = string( buffer );