diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-04 14:14:15 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-05 09:29:52 -0500 |
| commit | 278b3534e3aa27b92f7d681f086cb071df75bffd (patch) | |
| tree | 4d4ce1211d1887a78808935fb580ae5175d6f02a /comphelper | |
| parent | e77c476610ee3f7ca4bbb9728b495e41372ac33a (diff) | |
fdo#59426: Don't try to repair package during flat detection phase.suse-3.6-10
Conflicts:
comphelper/source/misc/mediadescriptor.cxx
sc/source/ui/unoobj/scdetect.cxx
Change-Id: I35968241a79db0aabe06e25c0efac2aa3d1c5b84
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/mediadescriptor.hxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/mediadescriptor.cxx | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx index 55b89a25fdf8..b8278a8f309b 100644 --- a/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/comphelper/inc/comphelper/mediadescriptor.hxx @@ -113,6 +113,8 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap static const ::rtl::OUString& PROP_VIEWONLY(); static const ::rtl::OUString& PROP_DOCUMENTBASEURL(); + static const rtl::OUString& PROP_DEEPDETECTION(); + //------------------------------------------- // interface public: diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 544d4e5c955e..e87a4e3f1957 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -306,9 +306,12 @@ const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTBASEURL() return sProp; } -/*----------------------------------------------- - 10.03.2004 08:09 ------------------------------------------------*/ +const rtl::OUString& MediaDescriptor::PROP_DEEPDETECTION() +{ + static const rtl::OUString aProp("DeepDetection"); + return aProp; +} + MediaDescriptor::MediaDescriptor() : SequenceAsHashMap() { |