buildbot success in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Success Build revision 1482523 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/615 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot success in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Success Build revision 1476794 on branch openoffice/branches/ia2 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7ia2/builds/104 Build reason was: The Nightly scheduler named 'aoo-win7-ia2' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot success in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Success Build revision 1476794 on branch None Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7ia2/builds/103 Build reason was: forced: by IRC user on channel #asftest: after cleaning up processes on build machine Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot success in ASF Buildbot on aoo-w7snap
Hi! , The aoo-w7snap builder has just completed a run STATUS: Success Build revision 1479897 on branch None Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7snap/builds/53 Build reason was: forced: by IRC user on channel #asftest: run after cleaning up processes on build machine Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
[CONF] Apache OpenOffice Community > Stage 2 Logo Refinement
Space: Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Page: Stage 2 Logo Refinement (https://cwiki.apache.org/confluence/display/OOOUSERS/Stage+2+Logo+Refinement) Attached by Samer Mansour: - sm - may 13th.zip (54 kB) - https://cwiki.apache.org/confluence/download/attachments/31821474/sm+-+may+13th.zip?version=1&modificationDate=1368561466831 Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
[CONF] Apache OpenOffice Community > Stage 2 Logo Refinement
Space: Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Page: Stage 2 Logo Refinement (https://cwiki.apache.org/confluence/display/OOOUSERS/Stage+2+Logo+Refinement) Edited by Samer Mansour: - Samer Mansour !index.png! Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
[CONF] Apache OpenOffice Community > Stage 2 Logo Refinement
Space: Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Page: Stage 2 Logo Refinement (https://cwiki.apache.org/confluence/display/OOOUSERS/Stage+2+Logo+Refinement) Attached by Samer Mansour: - index.png (10 kB) - https://cwiki.apache.org/confluence/download/attachments/31821474/index.png?version=1&modificationDate=1368561337522 Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
buildbot success in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Success Build revision 1482259 on branch None Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/614 Build reason was: forced: by IRC user on channel #asftest: forced clean build after orw's buildbot changes Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1482523 - /openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx
Author: paveljanik Date: Tue May 14 18:59:35 2013 New Revision: 1482523 URL: http://svn.apache.org/r1482523 Log: Remove unused variable to prevent compiler warning. Modified: openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx Modified: openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx?rev=1482523&r1=1482522&r2=1482523&view=diff == --- openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx (original) +++ openoffice/trunk/main/svx/source/sidebar/insert/InsertPropertyPanel.cxx Tue May 14 18:59:35 2013 @@ -112,7 +112,6 @@ IMPL_LINK(InsertPropertyPanel, WindowEve return 1; Window* pWindow = dynamic_cast(pEvent)->GetWindow(); -Window* pParent = pWindow->GetParent(); ToolBox* pToolBox = dynamic_cast(pWindow); if (pToolBox == NULL) return 1;
svn commit: r1482424 - in /openoffice/trunk/main/sfx2: inc/sfx2/sidebar/ControllerFactory.hxx source/sidebar/FocusManager.cxx source/sidebar/SidebarToolBox.cxx
Author: af
Date: Tue May 14 16:23:55 2013
New Revision: 1482424
URL: http://svn.apache.org/r1482424
Log:
122302: Added missing includes.
Modified:
openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx
Modified: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx?rev=1482424&r1=1482423&r2=1482424&view=diff
==
--- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx (original)
+++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx Tue May
14 16:23:55 2013
@@ -29,6 +29,8 @@
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
+class ToolBox;
+
namespace sfx2 { namespace sidebar {
/** Convenience class for easy creation of toolbox controllers.
Modified: openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx?rev=1482424&r1=1482423&r2=1482424&view=diff
==
--- openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx Tue May 14
16:23:55 2013
@@ -194,11 +194,13 @@ FocusManager::FocusLocation FocusManager
{
// Check the deck title.
if (mpDeckTitleBar != NULL)
+{
if (mpDeckTitleBar == &rWindow)
return FocusLocation(PC_DeckTitle, -1);
else if (&mpDeckTitleBar->GetToolBox() == &rWindow)
return FocusLocation(PC_DeckToolBox, -1);
-
+}
+
// Search the panels.
for (sal_Int32 nIndex=0,nCount(maPanels.size()); nIndexhttp://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx?rev=1482424&r1=1482423&r2=1482424&view=diff
==
--- openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx Tue May 14
16:23:55 2013
@@ -28,6 +28,9 @@
#include "sfx2/sidebar/Tools.hxx"
#include
+#include
+#include
+#include
using namespace ::com::sun::star;
svn commit: r1482369 - /openoffice/trunk/main/solenv/unxmacxp/
Author: hdu Date: Tue May 14 15:01:15 2013 New Revision: 1482369 URL: http://svn.apache.org/r1482369 Log: remove empty solenv/unxmacxp directory Suggested by: Pedro Giffuni Removed: openoffice/trunk/main/solenv/unxmacxp/
svn commit: r1482365 - /openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl
Author: hdu
Date: Tue May 14 14:56:31 2013
New Revision: 1482365
URL: http://svn.apache.org/r1482365
Log:
default to the strip tool to next to the compiler but don't depend on it
Modified:
openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl?rev=1482365&r1=1482364&r2=1482365&view=diff
==
--- openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl Tue May 14
14:56:31 2013
@@ -737,7 +737,8 @@ sub is_unstripped {
sub initialize_strip {
if ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq "")) {
$strip .= 'guw ' if ($^O eq 'cygwin');
-$strip .= $::CC_PATH . 'strip';
+$strip .= $::CC_PATH if (-e $::CC_PATH.'/strip');
+$strip .= 'strip';
$strip .= " -x" if ($ENV{OS} eq 'MACOSX');
$strip .= " -R '.comment' -s" if ($ENV{OS} eq 'LINUX');
};
svn commit: r1482331 - in /openoffice/trunk/main/svx/source/sidebar: paragraph/ParaLineSpacingControl.cxx paragraph/ParaPropertyPanel.cxx possize/PosSizePropertyPanel.cxx
Author: orw
Date: Tue May 14 13:37:28 2013
New Revision: 1482331
URL: http://svn.apache.org/r1482331
Log:
correct context switch handling in paragraph property panel and position and
size property panel
Modified:
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
Modified:
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx?rev=1482331&r1=1482330&r2=1482331&view=diff
==
---
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
(original)
+++
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
Tue May 14 13:37:28 2013
@@ -471,43 +471,38 @@ void ParaLineSpacingControl::Rearrange(S
aLineDist.SaveValue();
- sal_uInt16 uCount = aLineDist.GetEntryCount();
- if( uCount == LLINESPACE_FIX + 1 )
- {
- switch (currentContext.GetCombinedContext())
- {
- case CombinedEnumContext(Application_Impress,
Context_Table):
- case CombinedEnumContext(Application_Draw,
Context_Table):
- case CombinedEnumContext(Application_Writer,
Context_DrawText):
- case CombinedEnumContext(Application_Calc,
Context_DrawText):
- case CombinedEnumContext(Application_Draw,
Context_DrawText):
- case CombinedEnumContext(Application_Impress,
Context_DrawText):
- case CombinedEnumContext(Application_Writer,
Context_Annotation):
- case CombinedEnumContext(Application_Draw,
Context_Draw):
- case CombinedEnumContext(Application_Draw,
Context_TextObject):
- case CombinedEnumContext(Application_Draw,
Context_Graphic):
- case CombinedEnumContext(Application_Impress,
Context_Draw):
- case CombinedEnumContext(Application_Impress,
Context_TextObject):
- case CombinedEnumContext(Application_Impress,
Context_Graphic):
- {
- aLineDist.RemoveEntry(LLINESPACE_FIX);
- }
- }
- }
- else if( uCount == LLINESPACE_FIX)
- {
- switch (currentContext.GetCombinedContext())
- {
- case CombinedEnumContext(Application_Writer,
Context_Default):
- case CombinedEnumContext(Application_Writer,
Context_Text):
- case CombinedEnumContext(Application_Writer,
Context_Table):
- {
-
aLineDist.InsertEntry(String::CreateFromAscii("Fixed"), LLINESPACE_FIX);
- }
- }
- }
- maLineSpacing.Format();
- maLineSpacing.StartSelection();
+const sal_uInt16 uCount = aLineDist.GetEntryCount();
+if( uCount == LLINESPACE_FIX + 1 )
+{
+switch (currentContext.GetCombinedContext_DI())
+{
+case CombinedEnumContext(Application_DrawImpress, Context_Table):
+case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
+case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
+case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
+case CombinedEnumContext(Application_Calc, Context_DrawText):
+case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
+case CombinedEnumContext(Application_WriterVariants,
Context_Annotation):
+{
+aLineDist.RemoveEntry(LLINESPACE_FIX);
+}
+}
+}
+else if( uCount == LLINESPACE_FIX)
+{
+switch (currentContext.GetCombinedContext_DI())
+{
+case CombinedEnumContext(Application_WriterVariants,
Context_Default):
+case CombinedEnumContext(Application_WriterVariants, Context_Text):
+case CombinedEnumContext(Application_WriterVariants,
Context_Table):
+{
+aLineDist.InsertEntry(String::CreateFromAscii("Fixed"),
LLINESPACE_FIX);
+}
+}
+}
+maLineSpacing.Format();
+maLineSpacing.StartSelection();
}
void ParaLineSpacingControl::SetAllNoSel()
Modified:
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx?rev=1482331&r1=1482330&r2=1482331&view=diff
==
svn commit: r1482326 - in /openoffice/trunk/main: officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs sfx2/inc/sfx2/sidebar/EnumContext.hxx sfx2/source/sidebar/EnumContext.cxx sfx2/source/s
Author: orw
Date: Tue May 14 13:21:45 2013
New Revision: 1482326
URL: http://svn.apache.org/r1482326
Log:
122056: adding another Writer variant for sidebar context handling
Patch by: Ariel
Review by: Oliver
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx
openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx
openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs?rev=1482326&r1=1482325&r2=1482326&view=diff
==
---
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
(original)
+++
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
Tue May 14 13:21:45 2013
@@ -88,6 +88,7 @@
com.sun.star.text.WebDocument
com.sun.star.xforms.XMLFormDocument
com.sun.star.sdb.FormDesign
+ com.sun.star.sdb.TextReportDesign
com.sun.star.sheet.SpreadsheetDocument
com.sun.star.presentation.PresentationDocument
com.sun.star.drawing.DrawingDocument
Modified: openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx?rev=1482326&r1=1482325&r2=1482326&view=diff
==
--- openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx (original)
+++ openoffice/trunk/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx Tue May 14
13:21:45 2013
@@ -41,6 +41,7 @@ public:
Application_WriterWeb,
Application_WriterXML,
Application_WriterForm,
+Application_WriterReport,
Application_Calc,
Application_Draw,
Application_Impress,
Modified: openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx?rev=1482326&r1=1482325&r2=1482326&view=diff
==
--- openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/EnumContext.cxx Tue May 14
13:21:45 2013
@@ -98,6 +98,8 @@ sal_Int32 EnumContext::GetCombinedContex
case Application_WriterGlobal:
case Application_WriterWeb:
case Application_WriterXML:
+case Application_WriterForm:
+case Application_WriterReport:
return CombinedEnumContext(Application_WriterVariants, meContext);
default:
@@ -164,6 +166,7 @@ void EnumContext::ProvideApplicationCont
AddEntry(A2S("com.sun.star.text.WebDocument"),
EnumContext::Application_WriterWeb);
AddEntry(A2S("com.sun.star.xforms.XMLFormDocument"),
EnumContext::Application_WriterXML);
AddEntry(A2S("com.sun.star.sdb.FormDesign"),
EnumContext::Application_WriterForm);
+AddEntry(A2S("com.sun.star.sdb.TextReportDesign"),
EnumContext::Application_WriterReport);
AddEntry(A2S("com.sun.star.sheet.SpreadsheetDocument"),
EnumContext::Application_Calc);
AddEntry(A2S("com.sun.star.drawing.DrawingDocument"),
EnumContext::Application_Draw);
AddEntry(A2S("com.sun.star.presentation.PresentationDocument"),
EnumContext::Application_Impress);
Modified: openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx?rev=1482326&r1=1482325&r2=1482326&view=diff
==
--- openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx Tue May 14
13:21:45 2013
@@ -447,6 +447,7 @@ void ResourceManager::ReadContextList (
aApplications.push_back(EnumContext::Application_WriterWeb);
aApplications.push_back(EnumContext::Application_WriterXML);
aApplications.push_back(EnumContext::Application_WriterForm);
+aApplications.push_back(EnumContext::Application_WriterReport);
}
else
{
svn commit: r1482314 - in /openoffice/trunk/main/svx/source/sidebar/paragraph: ParaLineSpacingControl.cxx ParaLineSpacingControl.hxx ParaPropertyPanel.hrc
Author: orw
Date: Tue May 14 12:10:04 2013
New Revision: 1482314
URL: http://svn.apache.org/r1482314
Log:
122270: paragraph property panel, line spacing control: do not directly select
item via cursor travelling; removing obsolete code
Modified:
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
Modified:
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx?rev=1482314&r1=1482313&r2=1482314&view=diff
==
---
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
(original)
+++
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
Tue May 14 12:10:04 2013
@@ -67,7 +67,6 @@ maSpacing1 (SVX_RES(IMG_SPACING1))
maSpacing115 (SVX_RES(IMG_SPACING115)),
maSpacing15 (SVX_RES(IMG_SPACING15)),
maSpacing2 (SVX_RES(IMG_SPACING2)),
-maLPCustom (SVX_RES(IMG_SPACINGLCUSTOM)),
maSelSpacing1(SVX_RES(IMG_SEL_SPACING1)),
maSelSpacing115 (SVX_RES(IMG_SEL_SPACING115)),
maSelSpacing15 (SVX_RES(IMG_SEL_SPACING15)),
@@ -105,76 +104,64 @@ ParaLineSpacingControl::~ParaLineSpacing
void ParaLineSpacingControl::initial()
{
- //maLineSpacing.SetStyle( maLineSpacing.GetStyle()| WB_3DLOOK |
WB_NO_DIRECTSELECT );
-
//maLineSpacing.SetControlBackground(GetSettings().GetStyleSettings().GetMenuColor());
-
//maLineSpacing.SetColor(GetSettings().GetStyleSettings().GetMenuColor());
- //maLineSpacing.SetMinFont();
-
-
maLineSpacing.SetControlBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
- GetSettings().GetStyleSettings().GetMenuColor():
- sfx2::sidebar::Theme::GetColor(
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
maLineSpacing.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
- GetSettings().GetStyleSettings().GetMenuColor():
- sfx2::sidebar::Theme::GetColor(
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
maLineSpacing.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
- GetSettings().GetStyleSettings().GetMenuColor():
- sfx2::sidebar::Theme::GetColor(
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
//maFTSpacing.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
- //GetSettings().GetStyleSettings().GetMenuColor():
- //sfx2::sidebar::Theme::GetColor(
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
//maFTBy.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
- //GetSettings().GetStyleSettings().GetMenuColor():
- //sfx2::sidebar::Theme::GetColor(
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
- mpImg = new Image[4];
- mpImg[0] = maSpacing1;
- mpImg[1] = maSpacing115;
- mpImg[2] = maSpacing15;
- mpImg[3] = maSpacing2;
-
- mpImgSel = new Image[4];
- mpImgSel[0] = maSelSpacing1;
- mpImgSel[1] = maSelSpacing115;
- mpImgSel[2] = maSelSpacing15;
- mpImgSel[3] = maSelSpacing2;
-
- mpStr = new XubString[4];
- mpStr[0] = XubString(SVX_RES(STR_SPACING1));
- mpStr[1] = XubString(SVX_RES(STR_SPACING115));
- mpStr[2] = XubString(SVX_RES(STR_SPACING15));
- mpStr[3] = XubString(SVX_RES(STR_SPACING2));
-
- mpStrTip = new XubString[4];
- mpStrTip[0] = XubString(SVX_RES(STR_LS_SINGLE));
- mpStrTip[1] = XubString(SVX_RES(STR_LS_115));
- mpStrTip[2] = XubString(SVX_RES(STR_LS_15));
- mpStrTip[3] = XubString(SVX_RES(STR_LS_DOUBLE));
- for (int i=0;i<4;i++)
- maLineSpacing.AddItem(mpImg[i],
&mpImgSel[i],mpStr[i],&mpStrTip[i]);
-
- maLineSpacing.AddItem( maImgCus, 0, maStrCus, 0 );
-
- SetAllNoSel();
- Link aLink = LINK(this, ParaLineSpacingControl,VSSelHdl );
- maLineSpacing.SetSelectHdl(aLink);
- maLineSpacing.StartSelection();
- maLineSpacing.Show();
+maLineSpacing.SetStyle( maLineSpacing.GetStyle()| WB_3DLOOK |
WB_NO_DIRECTSELECT );
- aLink = LINK( this, ParaLineSpacingControl, LineSPDistHdl_Impl );
- aLineDist.SetSelectHdl(aLink);
- aLineDist.SelectEntryPos( LLINESPACE_1 ) ;
- aLink = LINK( this, ParaLineSpacingControl, LineSPDistAtHdl_Impl );
- aLineDistAtPercentBox.SetModifyHdl( aLink );
- aLineDistAtMetricBox.SetModifyHdl( aLink );
-}
-void ParaLineSpacingControl::ToGetFocus(bool bType)
-{
- if(!bType)
- aLineDist.GrabFocus();
- else
- maLineSpacing.GrabFocus(); //wj
+maLineSpacing.SetControlBackground(
+GetSettings().GetStyleSettings().GetHighContrastMode()
+
svn commit: r1482298 - /openoffice/trunk/main/default_images/svx/res/symphony/list.txt
Author: orw Date: Tue May 14 10:58:31 2013 New Revision: 1482298 URL: http://svn.apache.org/r1482298 Log: 122289: removing another obsolete file Removed: openoffice/trunk/main/default_images/svx/res/symphony/list.txt
buildbot failure in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Failure Build revision 1482259 on branch None Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/613 Build reason was: forced: by IRC user on channel #asftest: clean build after orw's buildbot changes have been picked up Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot exception in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Exception Build revision 1482157 on branch None Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/612 Build reason was: forced: by IRC user on channel #asftest: clean build after orw's buildbot changes Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1482259 - /openoffice/trunk/main/default_images/svx/res/symphony/_.png
Author: orw Date: Tue May 14 09:07:56 2013 New Revision: 1482259 URL: http://svn.apache.org/r1482259 Log: 122289: removing obsolete file Removed: openoffice/trunk/main/default_images/svx/res/symphony/_.png
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1482197 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/606 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
