default_images/sw/res/image-example.png |binary dev/null |binary ooo_custom_images/hicontrast/sw/res/image-example.png |binary ooo_custom_images/human/sw/res/image-example.png |binary ooo_custom_images/tango/sw/res/image-example.png |binary sw/source/ui/frmdlg/frmpage.cxx | 18 ++++++++++++++---- sw/source/ui/frmdlg/frmpage.src | 2 +- vcl/source/gdi/outdev2.cxx | 2 +- 8 files changed, 16 insertions(+), 6 deletions(-)
New commits: commit c60740a010cad96dd6a77ade90d8c1ed013b30fd Author: Jan Holesovsky <ke...@suse.cz> Date: Tue Dec 27 22:25:36 2011 +0100 Fix drawing of the either horizontally, or vertically mirrored bitmaps. diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index d405367..d8d847e 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -1821,7 +1821,7 @@ Bitmap OutputDevice::ImplBlend( Bitmap aBmp, aTR.mnDestWidth = aOutSz.Width(); aTR.mnDestHeight= aOutSz.Height(); - if( !bHMirr || !bVMirr ) + if( !bHMirr && !bVMirr ) bFastBlend = ImplFastBitmapBlending( *pB,*pP,*pA, aTR ); } commit 6095326517e05513085f379055e86b5d3c0270fd Author: Stefan Knorr (astron) <heinzless...@gmail.com> Date: Mon Dec 19 12:37:59 2011 +0100 Try to draw replacement preview at original size diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 288141b..de3c4df 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -224,7 +224,7 @@ static FrmMap aHFlyHtmlMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_FLY_REL_PG_FRAME} }; -// own vertical alignment map for to frame anchored objects +// own vertical alignment map for objects anchored to frame #define VERT_FRAME_REL (LB_FLY_VERT_FRAME|LB_FLY_VERT_PRTAREA) static FrmMap aVFrameMap[] = @@ -1941,7 +1941,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) } /*-------------------------------------------------------------------- - Description: horizonal Pos + Description: horizontal Pos --------------------------------------------------------------------*/ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB ) { @@ -2555,14 +2555,24 @@ void BmpWindow::Paint( const Rectangle& ) aGrfSize = ::GetGraphicSizeTwip(aGraphic, this); //it should show the default bitmap also if no graphic can be found if(!aGrfSize.Width() && !aGrfSize.Height()) - aGrfSize = PixelToLogic(aBmp.GetSizePixel()); + aGrfSize = PixelToLogic(aBmp.GetSizePixel()); long nRelGrf = aGrfSize.Width() * 100L / aGrfSize.Height(); long nRelWin = aPntSz.Width() * 100L / aPntSz.Height(); if(nRelGrf < nRelWin) { const long nWidth = aPntSz.Width(); - aPntSz.Width() = aPntSz.Height() * nRelGrf /100; + // if we use a replacement preview, try to draw at original size + if ( !bGraphic && ( aGrfSize.Width() <= aPntSz.Width() ) && ( aGrfSize.Height() <= aPntSz.Height() ) ) + { + const long nHeight = aPntSz.Height(); + aPntSz.Width() = aGrfSize.Width(); + aPntSz.Height() = aGrfSize.Height(); + aPntPos.Y() += (nHeight - aPntSz.Height()) / 2; + } + else + aPntSz.Width() = aPntSz.Height() * nRelGrf /100; + if(!bLeftAlign) aPntPos.X() += nWidth - aPntSz.Width() ; } commit d9f06dd910c64385fbc386c392b089d1fa6e9351 Author: Stefan Knorr (astron) <heinzless...@gmail.com> Date: Sat Dec 17 18:51:17 2011 +0100 Remove the dog diff --git a/default_images/sw/res/dog.png b/default_images/sw/res/dog.png deleted file mode 100644 index f0d7347..0000000 Binary files a/default_images/sw/res/dog.png and /dev/null differ diff --git a/default_images/sw/res/image-example.png b/default_images/sw/res/image-example.png new file mode 100644 index 0000000..766ba0d Binary files /dev/null and b/default_images/sw/res/image-example.png differ diff --git a/ooo_custom_images/hicontrast/sw/res/dog.png b/ooo_custom_images/hicontrast/sw/res/dog.png deleted file mode 100644 index a6aaed8..0000000 Binary files a/ooo_custom_images/hicontrast/sw/res/dog.png and /dev/null differ diff --git a/ooo_custom_images/hicontrast/sw/res/image-example.png b/ooo_custom_images/hicontrast/sw/res/image-example.png new file mode 100644 index 0000000..0071c40 Binary files /dev/null and b/ooo_custom_images/hicontrast/sw/res/image-example.png differ diff --git a/ooo_custom_images/human/sw/res/dog.png b/ooo_custom_images/human/sw/res/dog.png deleted file mode 100644 index 3b9c02f..0000000 Binary files a/ooo_custom_images/human/sw/res/dog.png and /dev/null differ diff --git a/ooo_custom_images/human/sw/res/image-example.png b/ooo_custom_images/human/sw/res/image-example.png new file mode 100644 index 0000000..ea547f8 Binary files /dev/null and b/ooo_custom_images/human/sw/res/image-example.png differ diff --git a/ooo_custom_images/tango/sw/res/image-example.png b/ooo_custom_images/tango/sw/res/image-example.png new file mode 100644 index 0000000..ea547f8 Binary files /dev/null and b/ooo_custom_images/tango/sw/res/image-example.png differ diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src index f813471..4bd99ca 100644 --- a/sw/source/ui/frmdlg/frmpage.src +++ b/sw/source/ui/frmdlg/frmpage.src @@ -541,7 +541,7 @@ TabPage TP_GRF_EXT Size = MAP_APPFONT ( 260 , 185 ) ; Bitmap BMP_EXAMPLE { - File = "dog.bmp" ; + File = "image-example.bmp" ; }; FixedLine FL_CONNECT { _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits