Kaydet (Commit) 9619edae authored tarafından Chris Sherlock's avatar Chris Sherlock

vcl: cleanup namespaces is vcl/source/window/builder.cxx

Change-Id: Ie7abebb4fad50e55793b9c1e99c4108c335a928b
üst e37fb68c
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#include <window.h> #include <window.h>
#include <xmlreader/xmlreader.hxx> #include <xmlreader/xmlreader.hxx>
using namespace com::sun::star;
#ifdef DISABLE_DYNLOADING #ifdef DISABLE_DYNLOADING
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
...@@ -126,12 +124,12 @@ void VclBuilder::loadTranslations(const LanguageTag &rLanguageTag, const OUStrin ...@@ -126,12 +124,12 @@ void VclBuilder::loadTranslations(const LanguageTag &rLanguageTag, const OUStrin
OUString sZippedFile(rUri.copy(nLastSlash + 1, nEndName - nLastSlash - 1) + "/" + sLang + ".ui"); OUString sZippedFile(rUri.copy(nLastSlash + 1, nEndName - nLastSlash - 1) + "/" + sLang + ".ui");
try try
{ {
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = css::uno::Reference<css::packages::zip::XZipFileAccess2> xNameAccess =
packages::zip::ZipFileAccess::createWithURL( css::packages::zip::ZipFileAccess::createWithURL(
comphelper::getProcessComponentContext(), aTransBuf.makeStringAndClear()); comphelper::getProcessComponentContext(), aTransBuf.makeStringAndClear());
if (!xNameAccess.is()) if (!xNameAccess.is())
continue; continue;
uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(sZippedFile), uno::UNO_QUERY); css::uno::Reference<css::io::XInputStream> xInputStream(xNameAccess->getByName(sZippedFile), css::uno::UNO_QUERY);
if (!xInputStream.is()) if (!xInputStream.is())
continue; continue;
OStringBuffer sStr; OStringBuffer sStr;
...@@ -149,7 +147,7 @@ void VclBuilder::loadTranslations(const LanguageTag &rLanguageTag, const OUStrin ...@@ -149,7 +147,7 @@ void VclBuilder::loadTranslations(const LanguageTag &rLanguageTag, const OUStrin
handleTranslations(reader); handleTranslations(reader);
break; break;
} }
catch (const uno::Exception &) catch (const css::uno::Exception &)
{ {
} }
} }
...@@ -172,7 +170,7 @@ namespace ...@@ -172,7 +170,7 @@ namespace
} }
#endif #endif
VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUString& sUIFile, const OString& sID, const uno::Reference<frame::XFrame>& rFrame) VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUString& sUIFile, const OString& sID, const css::uno::Reference<css::frame::XFrame>& rFrame)
: m_sID(sID) : m_sID(sID)
, m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8)) , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
, m_pStringReplace(ResMgr::GetReadStringHook()) , m_pStringReplace(ResMgr::GetReadStringHook())
...@@ -204,7 +202,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr ...@@ -204,7 +202,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
handleChild(pParent, reader); handleChild(pParent, reader);
} }
catch (const uno::Exception &rExcept) catch (const css::uno::Exception &rExcept)
{ {
SAL_WARN("vcl.layout", "Unable to read .ui file: " << rExcept.Message); SAL_WARN("vcl.layout", "Unable to read .ui file: " << rExcept.Message);
throw; throw;
...@@ -871,7 +869,7 @@ namespace ...@@ -871,7 +869,7 @@ namespace
return sTooltipText; return sTooltipText;
} }
void setupFromActionName(Button *pButton, VclBuilder::stringmap &rMap, const uno::Reference<frame::XFrame>& rFrame) void setupFromActionName(Button *pButton, VclBuilder::stringmap &rMap, const css::uno::Reference<css::frame::XFrame>& rFrame)
{ {
if (!rFrame.is()) if (!rFrame.is())
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment