You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/02/28 11:08:12 UTC
svn commit: r1451164 - in /openoffice/trunk/main/fpicker/source/aqua:
CFStringUtilities.cxx NSURL_OOoAdditions.mm SalAquaPicker.cxx
Author: hdu
Date: Thu Feb 28 10:08:11 2013
New Revision: 1451164
URL: http://svn.apache.org/r1451164
Log:
fpicker: avoid variable-init bypassing jumps in switch statements
Modified:
openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.cxx
openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.mm
openoffice/trunk/main/fpicker/source/aqua/SalAquaPicker.cxx
Modified: openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.cxx?rev=1451164&r1=1451163&r2=1451164&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.cxx (original)
+++ openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.cxx Thu Feb 28 10:08:11 2013
@@ -86,7 +86,7 @@ rtl::OUString CFURLRefToOUString(CFURLRe
sURLString = CFURLGetString(aUrlRef);
CFRetain(sURLString);
break;
- case FILENAME:
+ case FILENAME: {
OSL_TRACE("Extracting the file name of an item");
CFStringRef fullString = CFURLGetString(aUrlRef);
CFURLRef dirRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
@@ -95,14 +95,14 @@ rtl::OUString CFURLRefToOUString(CFURLRe
CFIndex fullLength = CFStringGetLength(fullString);
CFRange substringRange = CFRangeMake(dirLength, fullLength - dirLength);
sURLString = CFStringCreateWithSubstring(NULL, fullString, substringRange);
- break;
- case PATHWITHOUTLASTCOMPONENT:
+ } break;
+ case PATHWITHOUTLASTCOMPONENT: {
OSL_TRACE("Extracting the last but one component of an item's path");
CFURLRef directoryRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
sURLString = CFURLGetString(directoryRef);
CFRetain(sURLString);
CFRelease(directoryRef);
- break;
+ } break;
default:
break;
}
Modified: openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.mm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.mm?rev=1451164&r1=1451163&r2=1451164&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.mm (original)
+++ openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.mm Thu Feb 28 10:08:11 2013
@@ -40,9 +40,9 @@
sURLString = [self absoluteString];
[sURLString retain];
break;
- case FILENAME:
+ case FILENAME: {
OSL_TRACE("Extracting the file name of an item");
- NSString *path = [self path];
+ NSString* path = [self path];
if (path == nil) {
sURLString = @"";
}
@@ -50,10 +50,10 @@
sURLString = [path lastPathComponent];
}
[sURLString retain];
- break;
- case PATHWITHOUTLASTCOMPONENT:
+ } break;
+ case PATHWITHOUTLASTCOMPONENT: {
OSL_TRACE("Extracting the last but one component of an item's path");
- path = [self absoluteString];
+ NSString* path = [self absoluteString];
if (path == nil) {
sURLString = @"";
}
@@ -63,7 +63,7 @@
sURLString = [path substringToIndex:([path length] - lastLength)];
}
[sURLString retain];
- break;
+ } break;
default:
break;
}
Modified: openoffice/trunk/main/fpicker/source/aqua/SalAquaPicker.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/aqua/SalAquaPicker.cxx?rev=1451164&r1=1451163&r2=1451164&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/aqua/SalAquaPicker.cxx (original)
+++ openoffice/trunk/main/fpicker/source/aqua/SalAquaPicker.cxx Thu Feb 28 10:08:11 2013
@@ -109,7 +109,7 @@ void SAL_CALL SalAquaPicker::implInitial
[(NSOpenPanel*)m_pDialog setCanChooseFiles:YES];
break;
- case NAVIGATIONSERVICES_SAVE:
+ case NAVIGATIONSERVICES_SAVE: {
OSL_TRACE("NAVIGATIONSERVICES_SAVE");
m_pDialog = [NSSavePanel savePanel];
[(NSSavePanel*)m_pDialog setCanSelectHiddenExtension:NO]; //changed for issue #102102
@@ -128,7 +128,7 @@ void SAL_CALL SalAquaPicker::implInitial
OSL_TRACE("Hiding extension");
[pDefaults setBool:YES forKey:kSetHideExtensionStateKey];
}
- break;
+ } break;
case NAVIGATIONSERVICES_DIRECTORY:
OSL_TRACE("NAVIGATIONSERVICES_DIRECTORY");