diff options
Diffstat (limited to 'sd/source/ui/dlg/TemplateScanner.cxx')
-rw-r--r-- | sd/source/ui/dlg/TemplateScanner.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 78bc6eb08766..b234c399f545 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace { +namespace { const ::rtl::OUString TITLE = ::rtl::OUString::createFromAscii ("Title"); const ::rtl::OUString TARGET_DIR_URL = ::rtl::OUString::createFromAscii ("TargetDirURL"); @@ -58,7 +58,7 @@ const ::rtl::OUString TARGET_URL = ::rtl::OUString::createFromAscii ("Targ const ::rtl::OUString DOCTEMPLATES = ::rtl::OUString::createFromAscii ("com.sun.star.frame.DocumentTemplates"); -// These strings are used to find impress templates in the tree of +// These strings are used to find impress templates in the tree of // template files. Should probably be determined dynamically. const ::rtl::OUString IMPRESS_BIN_TEMPLATE = ::rtl::OUString::createFromAscii ("application/vnd.stardivision.impress"); const ::rtl::OUString IMPRESS_XML_TEMPLATE = MIMETYPE_VND_SUN_XML_IMPRESS; @@ -126,7 +126,7 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) // highest priority. nPriority = 10; } - + return nPriority; } @@ -135,7 +135,7 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) -namespace sd +namespace sd { class TemplateScanner::FolderDescriptorList @@ -165,7 +165,7 @@ TemplateScanner::TemplateScanner (void) TemplateScanner::~TemplateScanner (void) { mpFolderDescriptors.reset(); - + // Delete all entries of the template list that have not been // transferred to another object. std::vector<TemplateDir*>::iterator I; @@ -180,7 +180,7 @@ TemplateScanner::~TemplateScanner (void) TemplateScanner::State TemplateScanner::GetTemplateRoot (void) { State eNextState (INITIALIZE_FOLDER_SCANNING); - + Reference<lang::XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory (); DBG_ASSERT (xFactory.is(), "TemplateScanner::GetTemplateRoot: xFactory is NULL"); @@ -226,7 +226,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) } else eNextState = ERROR; - + return eNextState; } @@ -257,7 +257,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) // first if necessary). if ( (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_OASIS) - || (sContentType == IMPRESS_BIN_TEMPLATE) + || (sContentType == IMPRESS_BIN_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_B)) { @@ -286,7 +286,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) eNextState = SCAN_FOLDER; } } - + return eNextState; } @@ -309,7 +309,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) Sequence<rtl::OUString> aProps (2); aProps[0] = TITLE; aProps[1] = TARGET_DIR_URL; - + // Create an cursor to iterate over the template folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_ONLY; mxFolderResultSet = Reference<sdbc::XResultSet>( @@ -331,7 +331,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) TemplateScanner::State TemplateScanner::GatherFolderList (void) { State eNextState (ERROR); - + Reference<com::sun::star::ucb::XContentAccess> xContentAccess (mxFolderResultSet, UNO_QUERY); if (xContentAccess.is() && mxFolderResultSet.is()) { @@ -356,7 +356,7 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) eNextState = SCAN_FOLDER; } - + return eNextState; } @@ -375,7 +375,7 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) ::rtl::OUString sTitle (aDescriptor.msTitle); ::rtl::OUString sTargetDir (aDescriptor.msTargetDir); ::rtl::OUString aId (aDescriptor.msContentIdentifier); - + maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment); if (maFolderContent.isFolder()) { @@ -393,7 +393,7 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) { eNextState = DONE; } - + return eNextState; } @@ -440,7 +440,7 @@ void TemplateScanner::RunNextStep (void) case INITIALIZE_ENTRY_SCAN: meState = InitializeEntryScanning(); break; - + case SCAN_ENTRY: meState = ScanEntry(); break; |