Skip to content

C
core
Kaydet (Commit) ad9eed11 authored tarafından Jürgen Schmidt's avatar Jürgen Schmidt
Dosyalara gözat
Seçenekler

#124311# merge fixes from AOO410 branch

üst 2ae9c18c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cui/source/dialogs/about.cxx
Dosyayı görüntüle @ ad9eed11
...@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId & rId ) : ...@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId & rId ) :
sbcopyright.appendAscii("Copyright "); sbcopyright.appendAscii("Copyright ");
sbcopyright.append((sal_Unicode)0x00a9); sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii(" "); sbcopyright.appendAscii(" ");
rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2013") ); rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2014") );
if (vendor.EqualsAscii("Apache Software Foundation")) { if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear); sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n"); sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
......
instsetoo_native/util/openoffice.lst
Dosyayı görüntüle @ ad9eed11
...@@ -321,7 +321,7 @@ Apache_OpenOffice_Beta_SDK ...@@ -321,7 +321,7 @@ Apache_OpenOffice_Beta_SDK
DOWNLOADSETUPICO ooosetup.ico DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1 DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1 RELATIVE_PATHES_IN_DDF 1
AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Beta-SDK AOODOWNLOADNAMEPREFIX Apache_OpenOffice_Beta-SDK
STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
STARTCENTER_INFO_URL http://www.openoffice.org STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://templates.openoffice.org STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
......
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