svn commit: r1610344 - /openoffice/ooo-site/trunk/content/tr/download/analyze.html
Author: bourock Date: Mon Jul 14 06:52:53 2014 New Revision: 1610344 URL: http://svn.apache.org/r1610344 Log: code update Modified: openoffice/ooo-site/trunk/content/tr/download/analyze.html Modified: openoffice/ooo-site/trunk/content/tr/download/analyze.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/tr/download/analyze.html?rev=1610344r1=1610343r2=1610344view=diff == --- openoffice/ooo-site/trunk/content/tr/download/analyze.html (original) +++ openoffice/ooo-site/trunk/content/tr/download/analyze.html Mon Jul 14 06:52:53 2014 @@ -3,17 +3,17 @@ head meta http-equiv=Content-Type content=text/html; charset=utf-8 / titleApache OpenOffice Ä°ndirmeleri - SaÄlam yayımın hatalarını çözümleyin/title - script type=text/javascript src=../../download/globalvars.js/script + script type=text/javascript src=/download/globalvars.js/script script type=text/javascript src=msg_prop_l10n_tr.js/script - script type=text/javascript src=../../download/languages.js/script - script type=text/javascript src=../../download/release_matrix.js/script - script type=text/javascript src=../../download/boxed_download.js/script - script type=text/javascript src=../../download/download.js/script + script type=text/javascript src=/download/languages.js/script + script type=text/javascript src=/download/release_matrix.js/script + script type=text/javascript src=/download/boxed_download.js/script + script type=text/javascript src=/download/download.js/script style type=text/css /* ![CDATA[ */ /* Exceptions on standard css ---*/ - @import ../../download/styles.css; - @import ../../download/exceptions.css; + @import /download/styles.css; + @import /download/exceptions.css; /* ]] */ /style /head @@ -40,8 +40,8 @@ + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' - + li + l10n.dl_analyze_instruction_select_text + /li - + li + l10n.dl_analyze_instruction_verify_text + /li + + li + l10n.dl_analyze_instruction_select_text + /li + + li + l10n.dl_analyze_instruction_verify_text + /li + li + l10n.dl_analyze_instruction_click_text + b[ + l10n.dl_analyze_update_button_text + ]/b/li + li + l10n.dl_analyze_instruction_click_text + b[ + l10n.dl_analyze_select_button_text + ]/b/li + li + l10n.dl_analyze_instruction_copy_text + b[ + l10n.dl_analyze_copy_button_text + ]/b/li @@ -85,7 +85,7 @@ !-- // The text in the H1 tag is intentionally shown as display: none (do not display). // This is to please accessibility tools like a screen reader. - document.write( h1 style='display: none;' + l10n.dl_download_headline_text + /h1 ); + document.write( h1 style='display: none;' + l10n.dl_headline_text + /h1 ); //-- /script @@ -95,13 +95,13 @@ !-- // Set a specific language ISO code to force to assemble a certain localized build as download link. - // Changed: The variable can now be found in the msg_prop_l10n.dl_ISO_code.js. + // Changed: The variable can now be found in the msg_prop_l10n_ISO_code.js. // Get the download box from a separate file. - createDownloadBox(); + DL.createDownloadBox(); // Fill the select boxes and wait for the user's choice. - init( 1 ); + DL.init( 1 ); entourage.initialize(); @@ -131,8 +131,8 @@ document.write( div style='clear: both + /input + input class='btn_analyze' type='button' name='copy' href='javascript:void( 0 )' -+ title=' + l10n.dl_analyze_copy_button_title + ' -+ value=' + l10n.dl_analyze_copy_button_text+ ' disabled style='color: #00; cursor: default;' / ++ title=' + l10n.dl_analyze_copy_button_title+ ' ++ value=' + l10n.dl_analyze_copy_button_text + ' disabled style='color: #00; cursor: default;' / + /form + pnbsp;/p @@ -163,23 +163,23 @@ document.write( div style='clear: both + trtdnavigator.systemLanguage /tdtd + navigator.systemLanguage + /td/tr + trtdnavigator.userAgent /tdtd + navigator.userAgent+ /td/tr ); - if ( navigator.userAgent.toLowerCase().indexOf( debian) != -1 ) + if ( navigator.userAgent.toLowerCase().indexOf( debian ) != -1 ) document.write( trtdDebian / Ubuntu / IceWeasel ?/tdtd + l10n.dl_analyze_table_yes_text + / - + l10n.dl_analyze_table_no_text + / + l10n.dl_analyze_table_no_text + /td/tr ); - else if ( navigator.userAgent.toLowerCase().indexOf( ubuntu) != -1 ) + + l10n.dl_analyze_table_no_text + / + l10n.dl_analyze_table_no_text + /td/tr ); + else if ( navigator.userAgent.toLowerCase().indexOf( ubuntu) != -1 ) document.write( trtdDebian / Ubuntu / IceWeasel ?/tdtd +
svn commit: r916139 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/tr/download/analyze.html
Author: buildbot Date: Mon Jul 14 06:56:08 2014 New Revision: 916139 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/tr/download/analyze.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 06:56:08 2014 @@ -1 +1 @@ -1610338 +1610344 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 06:56:08 2014 @@ -1 +1 @@ -1610338 +1610344 Modified: websites/staging/ooo-site/trunk/content/tr/download/analyze.html == --- websites/staging/ooo-site/trunk/content/tr/download/analyze.html (original) +++ websites/staging/ooo-site/trunk/content/tr/download/analyze.html Mon Jul 14 06:56:08 2014 @@ -5,17 +5,17 @@ meta http-equiv=Content-Type content=text/html; charset=utf-8 / titleApache OpenOffice Ä°ndirmeleri - SaÄlam yayımın hatalarını çözümleyin/title - script type=text/javascript src=../../download/globalvars.js/script + script type=text/javascript src=/download/globalvars.js/script script type=text/javascript src=msg_prop_l10n_tr.js/script - script type=text/javascript src=../../download/languages.js/script - script type=text/javascript src=../../download/release_matrix.js/script - script type=text/javascript src=../../download/boxed_download.js/script - script type=text/javascript src=../../download/download.js/script + script type=text/javascript src=/download/languages.js/script + script type=text/javascript src=/download/release_matrix.js/script + script type=text/javascript src=/download/boxed_download.js/script + script type=text/javascript src=/download/download.js/script style type=text/css /* ![CDATA[ */ /* Exceptions on standard css ---*/ - @import ../../download/styles.css; - @import ../../download/exceptions.css; + @import /download/styles.css; + @import /download/exceptions.css; /* ]] */ /style @@ -56,8 +56,8 @@ + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' - + li + l10n.dl_analyze_instruction_select_text + /li - + li + l10n.dl_analyze_instruction_verify_text + /li + + li + l10n.dl_analyze_instruction_select_text + /li + + li + l10n.dl_analyze_instruction_verify_text + /li + li + l10n.dl_analyze_instruction_click_text + b[ + l10n.dl_analyze_update_button_text + ]/b/li + li + l10n.dl_analyze_instruction_click_text + b[ + l10n.dl_analyze_select_button_text + ]/b/li + li + l10n.dl_analyze_instruction_copy_text + b[ + l10n.dl_analyze_copy_button_text + ]/b/li @@ -101,7 +101,7 @@ !-- // The text in the H1 tag is intentionally shown as display: none (do not display). // This is to please accessibility tools like a screen reader. - document.write( h1 style='display: none;' + l10n.dl_download_headline_text + /h1 ); + document.write( h1 style='display: none;' + l10n.dl_headline_text + /h1 ); //-- /script @@ -111,13 +111,13 @@ !-- // Set a specific language ISO code to force to assemble a certain localized build as download link. - // Changed: The variable can now be found in the msg_prop_l10n.dl_ISO_code.js. + // Changed: The variable can now be found in the msg_prop_l10n_ISO_code.js. // Get the download box from a separate file. - createDownloadBox(); + DL.createDownloadBox(); // Fill the select boxes and wait for the user's choice. - init( 1 ); + DL.init( 1 ); entourage.initialize(); @@ -147,8 +147,8 @@ document.write( div style='clear: both + /input + input class='btn_analyze' type='button' name='copy' href='javascript:void( 0 )' -+ title=' + l10n.dl_analyze_copy_button_title + ' -+ value=' + l10n.dl_analyze_copy_button_text+ ' disabled style='color: #00; cursor: default;' / ++ title=' + l10n.dl_analyze_copy_button_title+ ' ++ value=' + l10n.dl_analyze_copy_button_text + ' disabled style='color: #00; cursor: default;' / + /form + pnbsp;/p @@ -179,23 +179,23 @@ document.write( div style='clear: both + trtdnavigator.systemLanguage /tdtd + navigator.systemLanguage + /td/tr + trtdnavigator.userAgent /tdtd + navigator.userAgent+ /td/tr ); - if ( navigator.userAgent.toLowerCase().indexOf( debian) != -1 ) + if ( navigator.userAgent.toLowerCase().indexOf( debian ) != -1 ) document.write( trtdDebian / Ubuntu /
svn commit: r1610347 - /openoffice/trunk/main/sfx2/source/appl/impldde.cxx
Author: hdu
Date: Mon Jul 14 07:17:59 2014
New Revision: 1610347
URL: http://svn.apache.org/r1610347
Log:
#i125226# expect DDE servers to be already up
soffice is always up anyway and other DDE apps should be started manually
Modified:
openoffice/trunk/main/sfx2/source/appl/impldde.cxx
Modified: openoffice/trunk/main/sfx2/source/appl/impldde.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/appl/impldde.cxx?rev=1610347r1=1610346r2=1610347view=diff
==
--- openoffice/trunk/main/sfx2/source/appl/impldde.cxx (original)
+++ openoffice/trunk/main/sfx2/source/appl/impldde.cxx Mon Jul 14 07:17:59 2014
@@ -209,9 +209,6 @@ sal_Bool SvDDEObject::GetData( ::com::su
sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
{
-#if defined(WNT)
- static sal_Bool bInWinExec = sal_False;
-#endif
sal_uInt16 nLinkType = pSvLink-GetUpdateMode();
if( pConnection ) // Verbindung steht ja schon
{
@@ -238,69 +235,22 @@ sal_Bool SvDDEObject::Connect( SvBaseLin
pConnection = new DdeConnection( sServer, sTopic );
if( pConnection-GetError() )
{
- // kann man denn das System-Topic ansprechen ?
- // dann ist der Server oben, kennt nur nicht das Topic!
- if( sTopic.EqualsIgnoreCaseAscii( SYSTEM ) )
+ // check if the DDE server knows the SYSTEM topic
+ bool bSysTopic = false;
+ if( !sTopic.EqualsIgnoreCaseAscii( SYSTEM ))
{
- sal_Bool bSysTopic;
- {
- DdeConnection aTmp( sServer,
String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SYSTEM ) ) );
- bSysTopic = !aTmp.GetError();
- }
-
- if( bSysTopic )
- {
- nError = DDELINK_ERROR_DATA;
- return sal_False;
- }
- // ansonsten unter Win/WinNT die Applikation direkt
starten
+ DdeConnection aTmp( sServer, String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( SYSTEM ) ) );
+ bSysTopic = !aTmp.GetError();
}
-#if defined(WNT)
- // check the suitability of starting the DDE server
- const SvtSecurityOptions aSecOpts;
- bool bForbidden = (aSecOpts.GetMacroSecurityLevel() ==
eNEVER_EXECUTE);
- bForbidden |= (sServer.SearchChar( L:./%\\) !=
STRING_NOTFOUND);
- static const char* aBadServers[] = { cmd, rundll32 };
- for( int i = 0; i sizeof(aBadServers)/sizeof(*aBadServers);
++i)
- bForbidden |= (sServer.CompareIgnoreCaseToAscii(
aBadServers[i]) == COMPARE_EQUAL);
-
- // try to start the DDE server if it is not there already
- bForbidden |= (bInWinExec != sal_False);
- if( !bForbidden )
- {
- ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US
);
- aCmdLine.Append( .exe );
- aCmdLine.Append( ByteString( sTopic,
RTL_TEXTENCODING_ASCII_US ) );
-
- if( WinExec( aCmdLine.GetBuffer(), SW_SHOWMINIMIZED )
32 ) // TODO: use CreateProcess() instead
- nError = DDELINK_ERROR_APP;
- else
- {
- sal_uInt16 i;
- for( i=0; i5; i++ )
- {
- bInWinExec = sal_True;
- Application::Reschedule();
- bInWinExec = sal_False;
-
- delete pConnection;
- pConnection = new DdeConnection(
sServer, sTopic );
- if( !pConnection-GetError() )
- break;
- }
-
- if( i == 5 )
- {
- nError = DDELINK_ERROR_APP;
- }
- }
- }
- else
-#endif // WNT
+ if( bSysTopic )
{
- nError = DDELINK_ERROR_APP;
+ // if the system topic works then the server is up but
just doesn't know the original topic
+ nError = DDELINK_ERROR_DATA;
+ return sal_False;
}
+
+ nError = DDELINK_ERROR_APP;
}
if( LINKUPDATE_ALWAYS == nLinkType !pLink
!pConnection-GetError() )
svn commit: r1610350 - /openoffice/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js
Author: bourock Date: Mon Jul 14 07:22:01 2014 New Revision: 1610350 URL: http://svn.apache.org/r1610350 Log: Translation Modified: openoffice/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js Modified: openoffice/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js?rev=1610350r1=1610349r2=1610350view=diff == --- openoffice/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js (original) +++ openoffice/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js Mon Jul 14 07:22:01 2014 @@ -45,31 +45,31 @@ l10n.dl_green_box_select_box_os_values l10n.dl_green_box_select_box_language_values = [ Asturian (Asturianu), Basque (Euskara), - Bulgarian (бÑлгаÑÑки език), - Chinese [simplified] (ç®ä½ä¸æ), - Chinese [traditional] (æ£é«ä¸æ), - Czech (ÄeÅ¡tina), - Danish (Dansk), - Dutch (Nederlands), + Bulgarca (бÑлгаÑÑки език), + Ãince [basitleÅtirilmiÅ] (ç®ä½ä¸æ), + Ãince [geleneksel] (æ£é«ä¸æ), + Ãekçe (ÄeÅ¡tina), + Danca (Dansk), + Flemenkçe (Nederlands), Ä°ngilizce [Ä°ngiltere], Ä°ngilizce [ABD], - Finnish (Suomi), - French (Français), + Fince (Suomi), + Fransızca (Français), Galician (Galego), - German (Deutsch), - Greek (ελληνικά), + Almanca (Deutsch), + Yunanca (ελληνικά), Hebrew (×¢×ר×ת), Hindi (हिनà¥à¤¦à¥), Hungarian (Magyar), - Italian (Italiano), - Japanese (æ¥æ¬èª), + Ä°talyanca (Italiano), + Japonca (æ¥æ¬èª), Khmer (áá¶áá¶ááááá), - Korean (íêµì´), + Korece (íêµì´), Lithuanian (Lietuvių), Norwegian [Bokmal] (Norsk [BokmÃ¥l]), - Polish (Polski), - Portuguese [Brazilian] (Português [do Brasil]), - Portuguese [European] (Português [Europeu]), + Lehçe (Polski), + Portekizce [Brazilya] (Português [do Brasil]), + Portekizce [Avrupa] (Português [Europeu]), Rusça (Ð ÑÑÑкий), Scottish [Gaelic] (Gà idhlig), Serbian [Cyrillic] (CÑпÑки [ÑиÑилиÑом]), @@ -330,8 +330,8 @@ l10n.dl_analyze_update_button_text = T l10n.dl_analyze_update_button_title= AÅaÄıdaki tablo içine seçilen seçenekleri deÄer olarak koyun; l10n.dl_analyze_select_button_text = Tabloyu güncellemek için tıklayın; l10n.dl_analyze_select_button_title= AÅaÄıda tablodaki tüm veriyi seçin; -l10n.dl_analyze_copy_button_text = [Ctrl] + [C] ile Kopyalayın; -l10n.dl_analyze_copy_button_title = [Ctrl] + [C] aracılıÄıyla seçilen tablo verisini panoya kopyalayın;
svn commit: r916146 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/tr/download/msg_prop_l10n_tr.js
Author: buildbot Date: Mon Jul 14 07:24:23 2014 New Revision: 916146 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 07:24:23 2014 @@ -1 +1 @@ -1610344 +1610350 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 07:24:23 2014 @@ -1 +1 @@ -1610344 +1610350 Modified: websites/staging/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js == --- websites/staging/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js (original) +++ websites/staging/ooo-site/trunk/content/tr/download/msg_prop_l10n_tr.js Mon Jul 14 07:24:23 2014 @@ -45,31 +45,31 @@ l10n.dl_green_box_select_box_os_values l10n.dl_green_box_select_box_language_values = [ Asturian (Asturianu), Basque (Euskara), - Bulgarian (бÑлгаÑÑки език), - Chinese [simplified] (ç®ä½ä¸æ), - Chinese [traditional] (æ£é«ä¸æ), - Czech (ÄeÅ¡tina), - Danish (Dansk), - Dutch (Nederlands), + Bulgarca (бÑлгаÑÑки език), + Ãince [basitleÅtirilmiÅ] (ç®ä½ä¸æ), + Ãince [geleneksel] (æ£é«ä¸æ), + Ãekçe (ÄeÅ¡tina), + Danca (Dansk), + Flemenkçe (Nederlands), Ä°ngilizce [Ä°ngiltere], Ä°ngilizce [ABD], - Finnish (Suomi), - French (Français), + Fince (Suomi), + Fransızca (Français), Galician (Galego), - German (Deutsch), - Greek (ελληνικά), + Almanca (Deutsch), + Yunanca (ελληνικά), Hebrew (×¢×ר×ת), Hindi (हिनà¥à¤¦à¥), Hungarian (Magyar), - Italian (Italiano), - Japanese (æ¥æ¬èª), + Ä°talyanca (Italiano), + Japonca (æ¥æ¬èª), Khmer (áá¶áá¶ááááá), - Korean (íêµì´), + Korece (íêµì´), Lithuanian (Lietuvių), Norwegian [Bokmal] (Norsk [BokmÃ¥l]), - Polish (Polski), - Portuguese [Brazilian] (Português [do Brasil]), - Portuguese [European] (Português [Europeu]), + Lehçe (Polski), + Portekizce [Brazilya] (Português [do Brasil]), + Portekizce [Avrupa] (Português [Europeu]), Rusça (Ð ÑÑÑкий), Scottish [Gaelic] (Gà idhlig), Serbian [Cyrillic] (CÑпÑки [ÑиÑилиÑом]), @@ -330,8 +330,8 @@ l10n.dl_analyze_update_button_text = T
buildbot success in ASF Buildbot on aoo-win7
The Buildbot has detected a passing build on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/88 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Build Source Stamp: [branch openoffice/branches/AOO410] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
svn commit: r916147 - in /websites/production/ooo-site: cgi-bin/ content/
Author: bourock Date: Mon Jul 14 08:03:01 2014 New Revision: 916147 Log: Publishing svnmucc operation to ooo-site site by bourock Added: websites/production/ooo-site/cgi-bin/ - copied from r916146, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r916146, websites/staging/ooo-site/trunk/content/
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/79 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
svn commit: r1610386 [1/2] - /openoffice/branches/AOO410/extras/l10n/source/pt/localize.sdf
Author: jsc Date: Mon Jul 14 11:03:31 2014 New Revision: 1610386 URL: http://svn.apache.org/r1610386 Log: #125208# merge pt translation update for AOO 4.1.1, for early review Modified: openoffice/branches/AOO410/extras/l10n/source/pt/localize.sdf
svn commit: r1610393 [1/2] - /openoffice/trunk/extras/l10n/source/vi/localize.sdf
Author: jsc Date: Mon Jul 14 11:49:37 2014 New Revision: 1610393 URL: http://svn.apache.org/r1610393 Log: #125246# integrate vi translation update for AOO 4.1.1, for early review Modified: openoffice/trunk/extras/l10n/source/vi/localize.sdf
svn commit: r1610394 [1/2] - /openoffice/branches/AOO410/extras/l10n/source/vi/localize.sdf
Author: jsc Date: Mon Jul 14 11:52:37 2014 New Revision: 1610394 URL: http://svn.apache.org/r1610394 Log: #125246# merge vi translation update for AOO 4.1.1, for early review Modified: openoffice/branches/AOO410/extras/l10n/source/vi/localize.sdf
svn commit: r1610411 - in /openoffice/trunk/main/sw/source/core: fields/cellfml.cxx txtnode/atrfld.cxx
Author: orw
Date: Mon Jul 14 13:36:56 2014
New Revision: 1610411
URL: http://svn.apache.org/r1610411
Log:
125228: correct consideration of InputFields in table cells are part of table
formulas
Modified:
openoffice/trunk/main/sw/source/core/fields/cellfml.cxx
openoffice/trunk/main/sw/source/core/txtnode/atrfld.cxx
Modified: openoffice/trunk/main/sw/source/core/fields/cellfml.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/fields/cellfml.cxx?rev=1610411r1=1610410r2=1610411view=diff
==
--- openoffice/trunk/main/sw/source/core/fields/cellfml.cxx (original)
+++ openoffice/trunk/main/sw/source/core/fields/cellfml.cxx Mon Jul 14 13:36:56
2014
@@ -156,53 +156,61 @@ double SwTableBox::GetValue( SwTblCalcPa
if ( nSttPos rTxt.Len()
( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char ) )
{
- SwIndex aIdx( pTxtNd, nSttPos );
-SwTxtFld * const pTxtFld = static_castSwTxtFld*(
-pTxtNd-GetTxtAttrForCharAt(aIdx.GetIndex(),
RES_TXTATR_FIELD));
- if( !pTxtFld )
- break;
-
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); //
wieder zuruecksetzen
-
- const SwField* pFld = pTxtFld-GetFmtFld().GetField();
- switch( pFld-GetTyp()-Which() )
- {
- case RES_SETEXPFLD:
- nRet = ((SwSetExpField*)pFld)-GetValue();
- break;
- case RES_USERFLD:
- nRet = ((SwUserFieldType*)pFld)-GetValue();
- break;
- case RES_TABLEFLD:
- {
- SwTblField* pTblFld = (SwTblField*)pFld;
- if( !pTblFld-IsValid() )
// ist der Wert gueltig ??
- {
- // die richtige Tabelle
mitgeben!
- const SwTable* pTmp =
rCalcPara.pTbl;
- rCalcPara.pTbl =
pTxtNd-FindTableNode()-GetTable();
- pTblFld-CalcField( rCalcPara );
- rCalcPara.pTbl = pTmp;
- }
- nRet = pTblFld-GetValue();
- }
- break;
-
- case RES_DATETIMEFLD:
- nRet = ((SwDateTimeField*)pFld)-GetValue();
- break;
+SwTxtFld * const pTxtFld =
+static_castSwTxtFld*( pTxtNd-GetTxtAttrForCharAt( nSttPos,
RES_TXTATR_FIELD ) );
+if ( pTxtFld == NULL )
+break;
- case RES_JUMPEDITFLD:
- //JP 14.09.98: Bug 56112 - der Platzhalter kann
nie einen
- // gueltigen
Inhalt haben!
- nRet = 0;
- break;
+rCalcPara.rCalc.SetCalcError( CALC_NOERR );// wieder
zuruecksetzen
- default:
-String const value(pFld-ExpandField(true));
-nRet = rCalcPara.rCalc.Calculate(value).GetDouble();
- }
- }
+const SwField* pFld = pTxtFld-GetFmtFld().GetField();
+switch ( pFld-GetTyp()-Which() )
+{
+case RES_SETEXPFLD:
+nRet = ( (SwSetExpField*) pFld )-GetValue();
+break;
+case RES_USERFLD:
+nRet = ( (SwUserFieldType*) pFld )-GetValue();
+break;
+case RES_TABLEFLD:
+{
+SwTblField* pTblFld = (SwTblField*) pFld;
+if ( !pTblFld-IsValid() ) // ist der Wert gueltig
??
+{
+// die richtige Tabelle mitgeben!
+const SwTable* pTmp = rCalcPara.pTbl;
+rCalcPara.pTbl = pTxtNd-FindTableNode()-GetTable();
+pTblFld-CalcField( rCalcPara );
+rCalcPara.pTbl = pTmp;
+}
+nRet = pTblFld-GetValue();
+}
+break;
+
+case RES_DATETIMEFLD:
+nRet = ( (SwDateTimeField*) pFld )-GetValue();
+break;
+
+case RES_JUMPEDITFLD:
+// placeholder does not have valid content
+nRet = 0;
+break;
+
+default:
+
buildbot success in ASF Buildbot on openoffice-linux32-snapshot
The Buildbot has detected a passing build on builder openoffice-linux32-snapshot while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-snapshot/builds/7 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm3_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
svn commit: r1610422 - /openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx
Author: hdu
Date: Mon Jul 14 14:59:11 2014
New Revision: 1610422
URL: http://svn.apache.org/r1610422
Log:
#i125234# the scrollbar arrows disappeared in OSX=10.7
so the native-widget assumptions about the scrollbar layout has to be adjusted.
Modified:
openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx?rev=1610422r1=1610421r2=1610422view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx Mon Jul 14
14:59:11 2014
@@ -131,6 +131,10 @@ static ThemeButtonValue ImplGetButtonVal
}
}
+// the scrollbar arrows disappeared in OSX=10.7
+#define SCROLL_BUTTON_HEIGHT 0
+#define SCROLL_BUTTON_WIDTH 0
+
static bool AquaGetScrollRect( /* TODO: int nScreen, */ ControlPart nPart,
const Rectangle rControlRect, Rectangle rResultRect )
{
@@ -141,38 +145,38 @@ static bool AquaGetScrollRect( /* TODO:
{
case PART_BUTTON_UP:
if( GetSalData()-mbIsScrollbarDoubleMax )
- rResultRect.Top() = rControlRect.Bottom() -
2*BUTTON_HEIGHT;
-rResultRect.Bottom() = rResultRect.Top() + BUTTON_HEIGHT;
+ rResultRect.Top() = rControlRect.Bottom() -
2*SCROLL_BUTTON_HEIGHT;
+rResultRect.Bottom() = rResultRect.Top() + SCROLL_BUTTON_HEIGHT;
break;
case PART_BUTTON_DOWN:
-rResultRect.Top() = rControlRect.Bottom() - BUTTON_HEIGHT;
+rResultRect.Top() = rControlRect.Bottom() - SCROLL_BUTTON_HEIGHT;
break;
case PART_BUTTON_LEFT:
if( GetSalData()-mbIsScrollbarDoubleMax )
- rResultRect.Left() = rControlRect.Right() -
2*BUTTON_WIDTH;
- rResultRect.Right() = rResultRect.Left() + BUTTON_WIDTH;
+ rResultRect.Left() = rControlRect.Right() -
2*SCROLL_BUTTON_WIDTH;
+ rResultRect.Right() = rResultRect.Left() +
SCROLL_BUTTON_WIDTH;
break;
case PART_BUTTON_RIGHT:
- rResultRect.Left() = rControlRect.Right() -
BUTTON_WIDTH;
+ rResultRect.Left() = rControlRect.Right() -
SCROLL_BUTTON_WIDTH;
break;
case PART_TRACK_HORZ_AREA:
-rResultRect.Right() -= BUTTON_WIDTH + 1;
+rResultRect.Right() -= SCROLL_BUTTON_WIDTH + 1;
if( GetSalData()-mbIsScrollbarDoubleMax )
- rResultRect.Right() -= BUTTON_WIDTH;
+ rResultRect.Right() -= SCROLL_BUTTON_WIDTH;
else
- rResultRect.Left() += BUTTON_WIDTH + 1;
+ rResultRect.Left() += SCROLL_BUTTON_WIDTH + 1;
break;
case PART_TRACK_VERT_AREA:
-rResultRect.Bottom() -= BUTTON_HEIGHT + 1;
+rResultRect.Bottom() -= SCROLL_BUTTON_HEIGHT + 1;
if( GetSalData()-mbIsScrollbarDoubleMax )
- rResultRect.Bottom() -= BUTTON_HEIGHT;
+ rResultRect.Bottom() -= SCROLL_BUTTON_HEIGHT;
else
- rResultRect.Top() += BUTTON_HEIGHT + 1;
+ rResultRect.Top() += SCROLL_BUTTON_HEIGHT + 1;
break;
case PART_THUMB_HORZ:
if( GetSalData()-mbIsScrollbarDoubleMax )
buildbot success in ASF Buildbot on aoo-w7snap
The Buildbot has detected a passing build on builder aoo-w7snap while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-w7snap/builds/11 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
svn commit: r1610456 - /openoffice/ooo-site/trunk/content/lt/download/index.html
Author: astepukonis Date: Mon Jul 14 16:50:50 2014 New Revision: 1610456 URL: http://svn.apache.org/r1610456 Log: Translation improved. Modified: openoffice/ooo-site/trunk/content/lt/download/index.html Modified: openoffice/ooo-site/trunk/content/lt/download/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/lt/download/index.html?rev=1610456r1=1610455r2=1610456view=diff == --- openoffice/ooo-site/trunk/content/lt/download/index.html (original) +++ openoffice/ooo-site/trunk/content/lt/download/index.html Mon Jul 14 16:50:50 2014 @@ -317,10 +317,10 @@ ir nuolat gausÄjanÄiÄ plÄtin ul lia href=/dev_docs/source/sys_reqs_aoo40.html title=Kaupiklis: ~300MB laisvos vietos - Atmintis: gt;128MB - Procesorius: gt;500MHz - OS: âWinâ, âLinuxâ, âMac OSâ, âSolarisâ, âFreeBSDâ...Sistemos reikalavimai/a/li lia href=/license.html title=âApache OpenOfficeâ licencijaLicencija/a/li -lia href=http://openoffice.apache.org/downloads.html; title=PlÄtotojams ir įgudusiems naudotojams: gauti pirminį tekstÄ âApache OpenOfficeâ sudarymui.Pirminis tekstas/a/li -lia href=http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO; title=PlÄtotojams ir įgudusiems naudotojams: kaip sudaryti âApache OpenOfficeâ.Ä®rangos sudarymo vadovÄlis/a/li -lia href=http://openoffice.apache.org/downloads.html; title=PlÄtotojams: programavimo priemonių rinkinysProgramavimo priemonių rinkinys (SDK)/a/li - lia href=http://www.openoffice.org/download/devbuilds.html; title=Skirta programavimo kokybÄ prižiÅ«rintiems savanoriamsPrograminiai dariniai/a/li + lia href=http://openoffice.apache.org/downloads.html; title=Programuotojams ir įgudusiems naudotojams: pirminis tekstas âApache OpenOfficeâ sudarymuiPirminis tekstas/a/li +lia href=http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO; title=Programuotojams ir įgudusiems naudotojams: kaip sudaryti âApache OpenOfficeâ?Ä®rangos sudarymo vadovÄlis/a/li +lia href=http://openoffice.apache.org/downloads.html; title=Programuotojams: programavimo priemonių rinkinysProgramavimo priemonių rinkinys (SDK)/a/li + lia href=http://www.openoffice.org/download/devbuilds.html; title=Programavimo kokybÄ prižiÅ«rintiems savanoriamsPrograminiai dariniai/a/li /ul h3DokumentuotÄ/h3
svn commit: r916196 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/lt/download/index.html
Author: buildbot Date: Mon Jul 14 16:58:43 2014 New Revision: 916196 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/lt/download/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 16:58:43 2014 @@ -1 +1 @@ -1610350 +1610456 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 16:58:43 2014 @@ -1 +1 @@ -1610350 +1610456 Modified: websites/staging/ooo-site/trunk/content/lt/download/index.html == --- websites/staging/ooo-site/trunk/content/lt/download/index.html (original) +++ websites/staging/ooo-site/trunk/content/lt/download/index.html Mon Jul 14 16:58:43 2014 @@ -333,10 +333,10 @@ ir nuolat gausÄjanÄiÄ plÄtin ul lia href=/dev_docs/source/sys_reqs_aoo40.html title=Kaupiklis: ~300MB laisvos vietos - Atmintis: gt;128MB - Procesorius: gt;500MHz - OS: âWinâ, âLinuxâ, âMac OSâ, âSolarisâ, âFreeBSDâ...Sistemos reikalavimai/a/li lia href=/license.html title=âApache OpenOfficeâ licencijaLicencija/a/li -lia href=http://openoffice.apache.org/downloads.html; title=PlÄtotojams ir įgudusiems naudotojams: gauti pirminį tekstÄ âApache OpenOfficeâ sudarymui.Pirminis tekstas/a/li -lia href=http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO; title=PlÄtotojams ir įgudusiems naudotojams: kaip sudaryti âApache OpenOfficeâ.Ä®rangos sudarymo vadovÄlis/a/li -lia href=http://openoffice.apache.org/downloads.html; title=PlÄtotojams: programavimo priemonių rinkinysProgramavimo priemonių rinkinys (SDK)/a/li - lia href=http://www.openoffice.org/download/devbuilds.html; title=Skirta programavimo kokybÄ prižiÅ«rintiems savanoriamsPrograminiai dariniai/a/li + lia href=http://openoffice.apache.org/downloads.html; title=Programuotojams ir įgudusiems naudotojams: pirminis tekstas âApache OpenOfficeâ sudarymuiPirminis tekstas/a/li +lia href=http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO; title=Programuotojams ir įgudusiems naudotojams: kaip sudaryti âApache OpenOfficeâ?Ä®rangos sudarymo vadovÄlis/a/li +lia href=http://openoffice.apache.org/downloads.html; title=Programuotojams: programavimo priemonių rinkinysProgramavimo priemonių rinkinys (SDK)/a/li + lia href=http://www.openoffice.org/download/devbuilds.html; title=Programavimo kokybÄ prižiÅ«rintiems savanoriamsPrograminiai dariniai/a/li /ul h3DokumentuotÄ/h3
svn commit: r916197 - in /websites/production/ooo-site: cgi-bin/ content/
Author: astepukonis Date: Mon Jul 14 17:00:37 2014 New Revision: 916197 Log: Publishing svnmucc operation to ooo-site site by astepukonis Added: websites/production/ooo-site/cgi-bin/ - copied from r916196, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r916196, websites/staging/ooo-site/trunk/content/
svn commit: r1610478 - /openoffice/ooo-site/trunk/content/index_redirect.html
Author: marcus
Date: Mon Jul 14 18:22:35 2014
New Revision: 1610478
URL: http://svn.apache.org/r1610478
Log:
Show information in the alert box, some further updates
Modified:
openoffice/ooo-site/trunk/content/index_redirect.html
Modified: openoffice/ooo-site/trunk/content/index_redirect.html
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/index_redirect.html?rev=1610478r1=1610477r2=1610478view=diff
==
--- openoffice/ooo-site/trunk/content/index_redirect.html (original)
+++ openoffice/ooo-site/trunk/content/index_redirect.html Mon Jul 14 18:22:35
2014
@@ -92,75 +92,57 @@
DL.LANG_SEL = ;
var lang_iso= DL.getLanguage(); // Get the language ISO code
from browser guessed data.
var lang_text = ; // The message text that can be
shown.
-// var redirect= false;// Set a hard-redirect without
showing a message (false/true)?
-// var show= false;// Should the found language be
used to redirect (false/true)?
// Query if the browser language is one of the released languages.
// The array has 3 elements per language (defined in
/download/globalvars.js
for( var i = 0, j = DL.SEL_LANG.length; i j; i = i + 3 ) {
// If the ISO code is found in the language array.
if( DL.SEL_LANG[ i ] === lang_iso ) {
-/*
- // Only if the language is OK to redirect, assign the text and set
redirect = true.
- if( l10n.index_redirect_text[ i / 3 * 2 ] === y ) {
- lang_text = l10n.index_redirect_text[ i / 3 * 2 + 1 ];
- redirect = true;
- }
- break;
-*/
// Query for the redirect method (defined in /msg_prop_l10n.js,
column 0).
switch( l10n.index_redirect_text[ i / 3 * 2 ] ) {
case hard:
// Don't show a message, just redirect.
+
alert( Just for debugging purpose:
+ \n\n
+ Browser language ISO code: \t\t + lang_iso
+ \n
- + Redirect method? \t\t\t\t + Hard, without
message + \n );
+ + Redirect method? \t\t\t\t + Hard, without
message + \n
+ + Position in language array: \t\t+ i / 3
+ \n
+ + Found language text: \t\t\t +
l10n.index_redirect_text[ i / 3 * 2 + 1 ] );
window.open( http://www.openoffice.org/; + lang_iso , _self
);
break;
case soft:
// Show a message and redirect on user's click.
- alert( Just for debugging purpose:
+ \n\n
- + Browser language ISO code: \t\t + lang_iso
+ \n
- + Redirect method? \t\t\t\t + Soft, with message
+ \n
- + Position in language array: \t\t+ i / 3
+ \n
- + Found language text: \t\t\t + lang_text );
-
// Assign the message text (defined in /msg_prop_l10n.js,
column 1).
- lang_text = l10n.index_redirect_text[ i / 3 * 2 + 1 ];
-// redirect = true;
+
document.write( div id='redirect_box'
+ onclick='window.open( \http://www.openoffice.org/; +
lang_iso
+ \, \_blank\ ); return false;'
// + onclick='window.open( \http://www.openoffice.org/; +
lang_iso
// + \, \_self\ ); return false;'
- + p + lang_text + /p
+ + p + l10n.index_redirect_text[ i / 3 * 2 + 1 ] + /p
+ /div ); // redirect box
+
+ alert( Just for debugging purpose:
+ \n\n
+ + Browser language ISO code: \t\t + lang_iso
+ \n
+ + Redirect method? \t\t\t\t + Soft, with message
+ \n
+ + Position in language array: \t\t+ i / 3
+ \n
+ + Found language text: \t\t\t +
l10n.index_redirect_text[ i / 3 * 2 + 1 ] );
break;
case none:
default:
// Do and show nothing.
- lang_text = l10n.index_redirect_text[ i / 3 * 2 + 1 ];
+
alert( Just for debugging purpose:
+ \n\n
+ Browser language ISO code: \t\t + lang_iso
+ \n
+ Redirect method? \t\t\t\t + None, do and show
nothing + \n
+ Position in language array: \t\t+ i / 3
+ \n
- + Found language text: \t\t\t + lang_text );
+ + Found language text:
svn commit: r916204 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/index_redirect.html
Author: buildbot
Date: Mon Jul 14 18:24:55 2014
New Revision: 916204
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/index_redirect.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 14 18:24:55 2014
@@ -1 +1 @@
-1610456
+1610478
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 14 18:24:55 2014
@@ -1 +1 @@
-1610456
+1610478
Modified: websites/staging/ooo-site/trunk/content/index_redirect.html
==
--- websites/staging/ooo-site/trunk/content/index_redirect.html (original)
+++ websites/staging/ooo-site/trunk/content/index_redirect.html Mon Jul 14
18:24:55 2014
@@ -94,75 +94,57 @@
DL.LANG_SEL = ;
var lang_iso= DL.getLanguage(); // Get the language ISO code
from browser guessed data.
var lang_text = ; // The message text that can be
shown.
-// var redirect= false;// Set a hard-redirect without
showing a message (false/true)?
-// var show= false;// Should the found language be
used to redirect (false/true)?
// Query if the browser language is one of the released languages.
// The array has 3 elements per language (defined in
/download/globalvars.js
for( var i = 0, j = DL.SEL_LANG.length; i j; i = i + 3 ) {
// If the ISO code is found in the language array.
if( DL.SEL_LANG[ i ] === lang_iso ) {
-/*
- // Only if the language is OK to redirect, assign the text and set
redirect = true.
- if( l10n.index_redirect_text[ i / 3 * 2 ] === y ) {
- lang_text = l10n.index_redirect_text[ i / 3 * 2 + 1 ];
- redirect = true;
- }
- break;
-*/
// Query for the redirect method (defined in /msg_prop_l10n.js,
column 0).
switch( l10n.index_redirect_text[ i / 3 * 2 ] ) {
case hard:
// Don't show a message, just redirect.
+
alert( Just for debugging purpose:
+ \n\n
+ Browser language ISO code: \t\t + lang_iso
+ \n
- + Redirect method? \t\t\t\t + Hard, without
message + \n );
+ + Redirect method? \t\t\t\t + Hard, without
message + \n
+ + Position in language array: \t\t+ i / 3
+ \n
+ + Found language text: \t\t\t +
l10n.index_redirect_text[ i / 3 * 2 + 1 ] );
window.open( http://www.openoffice.org/; + lang_iso , _self
);
break;
case soft:
// Show a message and redirect on user's click.
- alert( Just for debugging purpose:
+ \n\n
- + Browser language ISO code: \t\t + lang_iso
+ \n
- + Redirect method? \t\t\t\t + Soft, with message
+ \n
- + Position in language array: \t\t+ i / 3
+ \n
- + Found language text: \t\t\t + lang_text );
-
// Assign the message text (defined in /msg_prop_l10n.js,
column 1).
- lang_text = l10n.index_redirect_text[ i / 3 * 2 + 1 ];
-// redirect = true;
+
document.write( div id='redirect_box'
+ onclick='window.open( \http://www.openoffice.org/; +
lang_iso
+ \, \_blank\ ); return false;'
// + onclick='window.open( \http://www.openoffice.org/; +
lang_iso
// + \, \_self\ ); return false;'
- + p + lang_text + /p
+ + p + l10n.index_redirect_text[ i / 3 * 2 + 1 ] + /p
+ /div ); // redirect box
+
+ alert( Just for debugging purpose:
+ \n\n
+ + Browser language ISO code: \t\t + lang_iso
+ \n
+ + Redirect method? \t\t\t\t + Soft, with message
+ \n
+ + Position in language array: \t\t+ i / 3
+ \n
+ + Found language text: \t\t\t +
l10n.index_redirect_text[ i / 3 * 2 + 1 ] );
break;
case none:
default:
// Do and show nothing.
- lang_text = l10n.index_redirect_text[ i / 3 * 2 + 1 ];
+
svn commit: r1610510 - in /openoffice/branches/alg/aw080: ./ ext_libraries/ ext_libraries/coinmp/ ext_libraries/gtest/ ext_libraries/ratscan/rat/ ext_libraries/ratscan/scan/ extras/l10n/source/ca-XV/
Author: alg Date: Mon Jul 14 20:09:11 2014 New Revision: 1610510 URL: http://svn.apache.org/r1610510 Log: Resync to trunk, windows non-pro build [This commit notification would consist of 79 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1610548 - /openoffice/ooo-site/trunk/content/marketing/art/galleries/logos/index.html
Author: kschenk Date: Mon Jul 14 22:44:29 2014 New Revision: 1610548 URL: http://svn.apache.org/r1610548 Log: More changes to include the orb and a link to old trademarked logo items. Modified: openoffice/ooo-site/trunk/content/marketing/art/galleries/logos/index.html Modified: openoffice/ooo-site/trunk/content/marketing/art/galleries/logos/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/marketing/art/galleries/logos/index.html?rev=1610548r1=1610547r2=1610548view=diff == --- openoffice/ooo-site/trunk/content/marketing/art/galleries/logos/index.html (original) +++ openoffice/ooo-site/trunk/content/marketing/art/galleries/logos/index.html Mon Jul 14 22:44:29 2014 @@ -69,8 +69,8 @@ p This is the official Apache OpenOffice logo to be used as a reference to both the product and the open source community behind the -product. -br +product./p +p In order to protect the brand OpenOffice, the logo is not licensed under an open source license. As it is trademarked you are allowed to use it, if the OpenOffice logo is used to refer to our product and our community. If you wish to use the OpenOffice logo please follow the a href=http://about.openoffice.org/index.html#logo; easy steps a/ for requesting permission. Furthermore the a href=http://wiki.services.openoffice.org/wiki/Logo_Usage_Guidelines;OpenOffice.org Logo Usage Guidelines /awill enable you to use the OpenOffice.org logo properly. @@ -85,12 +85,24 @@ You can download the Apache OpenOffice l a href=img src=index_files/logo_color.png title= style=border-style: none; alt=/a img alt=refreshed logo src=http://www.openoffice.org/marketing/art/galleries/logos/main/aoo4-main-tm-logo-rgb.png; align=middle +/p + +h3Apache OpenOffice Orb Logo/h3 +pThis trademarked item contains just the orb portion of the Apache OpenOffice logo./p +a href=/images/AOO_logos/svg/orb.svgimg src=/images/AOO_logos/orb.png alt=new orb logo/img/a +/p -h3Apache OpenOffice Logo Pins/h3 +h3Apache OpenOffice Orb Logo Pins/h3 p Apache OpenOffice 1 pins displayed in the picture below can be reordered from the a href=http://www.wackybuttons.com/preview.php?display=showdc1=3718704; link provided here /aif needed. br em(NOTE)/em This is only one of many merchants that can provide this kind of service and is not specifically endorsed by the Apache Software Foundation.p img src=AOO_Pins.jpeg alt=logo pins in gull formation hieght=447px width=794px/img -br +/p + +h3Older OpenOffice.org Trademarked Logos/h3 +pOlder OpenOffice.org trademarked logos, now held by the Apache Software Foundation, can be found +in a href=http://www.openoffice.org/marketing/art/galleries/logos/main_tm/;this location./a/p + + /body/html
svn commit: r916224 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/marketing/art/galleries/logos/index.html
Author: buildbot Date: Mon Jul 14 22:45:35 2014 New Revision: 916224 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 22:45:35 2014 @@ -1 +1 @@ -1610478 +1610548 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 22:45:35 2014 @@ -1 +1 @@ -1610478 +1610548 Modified: websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html == --- websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html (original) +++ websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html Mon Jul 14 22:45:35 2014 @@ -88,8 +88,8 @@ p This is the official Apache OpenOffice logo to be used as a reference to both the product and the open source community behind the -product. -br +product./p +p In order to protect the brand OpenOffice, the logo is not licensed under an open source license. As it is trademarked you are allowed to use it, if the OpenOffice logo is used to refer to our product and our community. If you wish to use the OpenOffice logo please follow the a href=http://about.openoffice.org/index.html#logo; easy steps a/ for requesting permission. Furthermore the a href=http://wiki.services.openoffice.org/wiki/Logo_Usage_Guidelines;OpenOffice.org Logo Usage Guidelines /awill enable you to use the OpenOffice.org logo properly. @@ -104,14 +104,26 @@ You can download the Apache OpenOffice l a href=img src=index_files/logo_color.png title= style=border-style: none; alt=/a img alt=refreshed logo src=http://www.openoffice.org/marketing/art/galleries/logos/main/aoo4-main-tm-logo-rgb.png; align=middle +/p + +h3Apache OpenOffice Orb Logo/h3 +pThis trademarked item contains just the orb portion of the Apache OpenOffice logo./p +a href=/images/AOO_logos/svg/orb.svgimg src=/images/AOO_logos/orb.png alt=new orb logo/img/a +/p -h3Apache OpenOffice Logo Pins/h3 +h3Apache OpenOffice Orb Logo Pins/h3 p Apache OpenOffice 1 pins displayed in the picture below can be reordered from the a href=http://www.wackybuttons.com/preview.php?display=showdc1=3718704; link provided here /aif needed. br em(NOTE)/em This is only one of many merchants that can provide this kind of service and is not specifically endorsed by the Apache Software Foundation.p img src=AOO_Pins.jpeg alt=logo pins in gull formation hieght=447px width=794px/img -br +/p + +h3Older OpenOffice.org Trademarked Logos/h3 +pOlder OpenOffice.org trademarked logos, now held by the Apache Software Foundation, can be found +in a href=http://www.openoffice.org/marketing/art/galleries/logos/main_tm/;this location./a/p + + /div !--#include virtual=/footer.html --
svn commit: r916225 - in /websites/production/ooo-site: cgi-bin/ content/
Author: kschenk Date: Mon Jul 14 22:53:36 2014 New Revision: 916225 Log: Publishing svnmucc operation to ooo-site site by kschenk Added: websites/production/ooo-site/cgi-bin/ - copied from r916224, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r916224, websites/staging/ooo-site/trunk/content/
svn commit: r1610552 - /openoffice/site/trunk/content/trademarks.mdtext
Author: kschenk Date: Mon Jul 14 22:59:19 2014 New Revision: 1610552 URL: http://svn.apache.org/r1610552 Log: Modified to include a link to the graphical logos page. Modified: openoffice/site/trunk/content/trademarks.mdtext Modified: openoffice/site/trunk/content/trademarks.mdtext URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/trademarks.mdtext?rev=1610552r1=1610551r2=1610552view=diff == --- openoffice/site/trunk/content/trademarks.mdtext (original) +++ openoffice/site/trunk/content/trademarks.mdtext Mon Jul 14 22:59:19 2014 @@ -20,7 +20,7 @@ Notice:Licensed to the Apache Softwa The Apache Software Foundation holds trademarks on behalf of its projects. For the Apache OpenOffice project these trademarks include the names Apache OpenOffice⢠and OpenOffice.org®, as well as the -graphical logos. Use of these marks is prohibited without explicit +[graphical logos] [5]. Use of these marks is prohibited without explicit permission from the ASF. However, the Apache OpenOffice project is happy to work with 3rd @@ -84,3 +84,4 @@ logo may be used according to the requir [2]: mailto:priv...@openoffice.apache.org?subject=Trademark [3]: http://openoffice.apache.org/get-it-here.html [4]: mailto:priv...@openoffice.apache.org?subject=Possible%20trademark%20infringement +[5]: http://www.openoffice.org/marketing/art/galleries/logos/index.html
svn commit: r916226 - in /websites/staging/openoffice/trunk/content: ./ trademarks.html
Author: buildbot Date: Mon Jul 14 22:59:24 2014 New Revision: 916226 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/trademarks.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 14 22:59:24 2014 @@ -1 +1 @@ -1606375 +1610552 Modified: websites/staging/openoffice/trunk/content/trademarks.html == --- websites/staging/openoffice/trunk/content/trademarks.html (original) +++ websites/staging/openoffice/trunk/content/trademarks.html Mon Jul 14 22:59:24 2014 @@ -102,7 +102,7 @@ pThe Apache Software Foundation holds trademarks on behalf of its projects. For the Apache OpenOffice project these trademarks include the names Apache OpenOffice⢠and OpenOffice.org®, as well as the -graphical logos. Use of these marks is prohibited without explicit +a href=http://www.openoffice.org/marketing/art/galleries/logos/index.html;graphical logos/a. Use of these marks is prohibited without explicit permission from the ASF./p pHowever, the Apache OpenOffice project is happy to work with 3rd parties who desire to use these trademarks in ways that are beneficial
svn commit: r916227 - /websites/production/openoffice/content/
Author: kschenk Date: Mon Jul 14 23:01:12 2014 New Revision: 916227 Log: Publishing svnmucc operation to openoffice site by kschenk Added: websites/production/openoffice/content/ - copied from r916226, websites/staging/openoffice/trunk/content/
