[ooo-build-commit] Branch 'ooo/OOO320' - 3 commits - connectivity/prj desktop/source drawinglayer/source svx/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jan 22 18:25:36 PST 2010
connectivity/prj/d.lst | 5 +--
desktop/source/registration/com/sun/star/servicetag/Util.java | 10 +++++-
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 6 ---
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 16 ++++++++++
4 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 0cf022ab64268772e90477cc83ed33124058a13e
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri Jan 22 09:44:25 2010 +0000
#i107957# deliver localized *.xcu files
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 728c8fe..0d26223 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -28,6 +28,7 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
#..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
+..\%__SRC%\misc\merge\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
\ No newline at end of file
+..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
+
commit 9f255439e8c3d1e5c7149647f733a24c10e250ed
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri Jan 22 08:17:34 2010 +0000
CWS-TOOLING: integrate CWS dba32z
2010-01-21 08:54:11 +0100 fs r277940 : copying nn's fix from CWS dba321a herein, original commit comment: #i108488# #i108512# don't remove SC_MF_SCENARIO in ScAttrArray::InsertRow, block-wise skipping in zip stream
2010-01-21 08:52:26 +0100 fs r277939 : reverting the fix for #i108325#, which caused #i108423#. Adding another, less invasive workaround. Still not the final solution, which is covered by issue 108357
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 473f0c6..de18983 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -372,12 +372,6 @@ namespace drawinglayer
aOrigin.X() + basegfx::fround(aTopLeftPixel.getX()),
aOrigin.Y() + basegfx::fround(aTopLeftPixel.getY()));
}
- else if( xControlWindow.is() )
- {
- Window* pWin = VCLUnoHelper::GetWindow( rXControl->getPeer() );
- if( pWin )
- pWin->Invalidate();
- }
// restore original graphics
xControlView->setGraphics(xOriginalGraphics);
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index f407557..3ca670e 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -238,6 +238,8 @@ namespace sdr { namespace contact {
getGraphics() const { return m_xControlView->getGraphics(); }
inline void draw( const Point& _rTopLeft ) const { m_xControlView->draw( _rTopLeft.X(), _rTopLeft.Y() ); }
+ void invalidate() const;
+
public:
inline const Reference< XControl >& getControl() const { return m_xControl; }
};
@@ -298,6 +300,15 @@ namespace sdr { namespace contact {
}
//--------------------------------------------------------------------
+ void ControlHolder::invalidate() const
+ {
+ Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() );
+ OSL_ENSURE( pWindow, "ControlHolder::invalidate: no implementation access!" );
+ if ( pWindow )
+ pWindow->Invalidate();
+ }
+
+ //--------------------------------------------------------------------
::basegfx::B2DVector ControlHolder::getZoom() const
{
// no check whether we're valid, this is the responsibility of the caller
@@ -1636,6 +1647,8 @@ namespace sdr { namespace contact {
double fRotate, fShearX;
_rViewInformation.getObjectToViewTransformation().decompose( aScale, aTranslate, fRotate, fShearX );
#endif
+ const bool bHadControl = m_pVOCImpl->getExistentControl().is();
+
// force control here to make it a VCL ChildWindow. Will be fetched
// and used below by getExistentControl()
m_pVOCImpl->ensureControl();
@@ -1646,6 +1659,9 @@ namespace sdr { namespace contact {
Reference< XControlModel > xControlModel( rViewContactOfUnoControl.GetSdrUnoObj().GetUnoControlModel() );
const ControlHolder& rControl( m_pVOCImpl->getExistentControl() );
+ if ( !bHadControl && rControl.is() && rControl.isVisible() )
+ rControl.invalidate();
+
// check if we already have an XControl.
if ( !xControlModel.is() || !rControl.is() )
// use the default mechanism. This will create a ControlPrimitive2D without
commit 59428dc4c48537514bddaa3ed5f8ea0623c38ad5
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri Jan 22 07:08:17 2010 +0000
#i10000# fix registry key
diff --git a/desktop/source/registration/com/sun/star/servicetag/Util.java b/desktop/source/registration/com/sun/star/servicetag/Util.java
index 7de1e83..1981a2f 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Util.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Util.java
@@ -224,9 +224,15 @@ class Util {
*/
static File getWindowsStClientFile() {
File out = null;
- String regKey = "software\\microsoft\\windows\\currentversion\\app paths\\stclient.exe";
+ String regKey1 = "software\\microsoft\\windows\\currentversion\\app paths\\sunstclient.exe";
String keyName = "" ; // use the default key
- String path = getRegistryKey(regKey, keyName);
+ String path = getRegistryKey(regKey1, keyName);
+
+ if ( path == null)
+ {
+ String regKey2 = "software\\microsoft\\windows\\currentversion\\app paths\\stclient.exe";
+ path = getRegistryKey(regKey2, keyName);
+ }
if (path != null && (new File(path)).exists()) {
out = new File(path);
More information about the ooo-build-commit
mailing list