summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-08-19 22:55:04 +0200
committerJulien Nabet <serval2412@yahoo.fr>2013-08-19 22:55:37 +0200
commitc43a0e35e59b9ccf179852f04784a0f6db5dc191 (patch)
tree1b447b5ec92310e1f3a8b03c9a43c1233ee03460 /sc
parente7164ec2858a25a9f57fac199132dea0e70a8555 (diff)
Revert "Seems unused too"
This reverts commit 0654a592df05df676540764c004bd5b4e8b693a9. Sorry Kohei for the noise
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 159b52cc2c23..ffdb7ea5bf0a 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -308,6 +308,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
// now some parameters that can already be in the array, but may be overwritten or new inserted here
// remember their indices in the case new values must be added to the array
sal_Int32 nPropertyCount = lDescriptor.getLength();
+ sal_Int32 nIndexOfFilterName = -1;
sal_Int32 nIndexOfInputStream = -1;
sal_Int32 nIndexOfContent = -1;
sal_Int32 nIndexOfReadOnlyFlag = -1;
@@ -336,6 +337,10 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
{
lDescriptor[nProperty].Value >>= sTemp;
aPreselectedFilterName = sTemp;
+
+ // if the preselected filter name is not correct, it must be erased after detection
+ // remember index of property to get access to it later
+ nIndexOfFilterName = nProperty;
}
else if ( lDescriptor[nProperty].Name == "InputStream" )
nIndexOfInputStream = nProperty;