summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-07-15 15:38:43 +0200
committerJoachim Lingner <jl@openoffice.org>2010-07-15 15:38:43 +0200
commita186784b389b90d15976d84172682927080f1197 (patch)
tree4432d7a7d03800e1eaa88f543f229962d50f9789 /desktop
parent68eea8200bde2d0d7228579b3eefe01451ff0ddd (diff)
jl154 #162868# fix warnings caused by 990df1d5ff27
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 01c07b9d3e4a..65059555ba35 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -545,7 +545,7 @@ static ::rtl::OUString getBasePresetsPathURL()
if ( aBaseInstallStatus == ::utl::Bootstrap::PATH_EXISTS )
{
::rtl::OUStringBuffer aTmp( aBaseInstallURL );
- ::sal_uInt32 nLastIndex = aBaseInstallURL.lastIndexOf('/');
+ ::sal_Int32 nLastIndex = aBaseInstallURL.lastIndexOf('/');
if ( nLastIndex != aBaseInstallURL.getLength()-1 )
aTmp.appendAscii( "/" );
@@ -569,7 +569,7 @@ static ::rtl::OUString getUserBundledExtPathURL()
static ::rtl::OUString getLastSyncFileURLFromBaseInstallation()
{
::rtl::OUString aBasePresetPathURL = getBasePresetsPathURL();
- ::sal_uInt32 nLastIndex = aBasePresetPathURL.lastIndexOf('/');
+ ::sal_Int32 nLastIndex = aBasePresetPathURL.lastIndexOf('/');
::rtl::OUStringBuffer aTmp( aBasePresetPathURL );
@@ -583,7 +583,7 @@ static ::rtl::OUString getLastSyncFileURLFromBaseInstallation()
static ::rtl::OUString getLastSyncFileURLFromUserInstallation()
{
::rtl::OUString aUserBundledPathURL = getUserBundledExtPathURL();
- ::sal_uInt32 nLastIndex = aUserBundledPathURL.lastIndexOf('/');
+ ::sal_Int32 nLastIndex = aUserBundledPathURL.lastIndexOf('/');
::rtl::OUStringBuffer aTmp( aUserBundledPathURL );
@@ -701,6 +701,7 @@ void Desktop::Init()
// copy bundled folder to the user directory
osl::FileBase::RC rc = osl::Directory::createPath(aUserPath);
+ (void) rc;
copy_bundled_recursive( aBasePresetsBundledPath, aUserPath, +1 );
}
}